From: Michael Hofmann <mhofm...@redhat.com>

Simplify ARK pipeline rules

Signed-off-by: Michael Hofmann <mhofm...@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,18 +47,17 @@ workflow:
     skip_test: 'true'
     skip_results: 'true'
   rules:
-    # Do a full build for non-automated bot config contributions
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build" &&
-           $CI_COMMIT_AUTHOR != "Fedora Kernel Team 
<kernel-t...@fedoraproject.org>"'
-      variables:
-        architectures: 'x86_64 aarch64 s390x ppc64le'
-        skip_build: 'false'
-        skip_publish: 'false'
-    # Default build - srpm only
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build"'
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "os-build"
+      when: never
+    # automated commits - srpm only
+    - if: $CI_COMMIT_AUTHOR == "Fedora Kernel Team 
<kernel-t...@fedoraproject.org>"
+      when: on_success
       variables:
         skip_build: 'true'
         skip_publish: 'true'
+    - when: on_success
+      variables:
+        architectures: 'x86_64 aarch64 s390x ppc64le'
 
 .trigger_eln_pipeline:
   stage: test

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2575
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to