From 75b26fe1a2b907ea2a25fd7f8ab0565cbc61d8bf Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 8 Jun 2021 07:15:11 +0200
Subject: multiarch: drop nocache build

---
 gitlab-ci-template-multiarch.yml | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/gitlab-ci-template-multiarch.yml b/gitlab-ci-template-multiarch.yml
index b6d877e..1d082af 100644
--- a/gitlab-ci-template-multiarch.yml
+++ b/gitlab-ci-template-multiarch.yml
@@ -47,46 +47,22 @@ stages:
     .
   - podman push $CI_REGISTRY_IMAGE:${TAGNAME}-${ARCH}
 
-build-default-x86_64:
+build-x86_64:
   stage: build
   variables:
     ARCH: x86_64
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
-  script:
-    - *tag-name
-    - *build-default
-
-build-nocache-x86_64:
-  stage: build
-  variables:
-    ARCH: x86_64
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
   script:
     - *tag-name
     - *build-nocache
 
-build-default-aarch64:
-  stage: build
-  tags:
-    - aarch64
-  variables:
-    ARCH: aarch64
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $BUILD_AARCH64 == "yes"'
-  script:
-    - *tag-name
-    - *build-default
-
-build-nocache-aarch64:
+build-aarch64:
   stage: build
   tags:
     - aarch64
   variables:
     ARCH: aarch64
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $BUILD_AARCH64 == "yes"'
+    - if: '$BUILD_AARCH64 == "yes"'
   script:
     - *tag-name
     - *build-nocache
-- 
cgit