Add old GA exclusion, rename pipeline and add exceptions on jobs

osbuild · Apr 30, 2024 · 4a1fd3b · 4a1fd3b
1 parent ff7276f
commit 4a1fd3b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 65 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -60,11 +60,11 @@ init:
 
 .upstream_rules_all:
   rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
 
 .upstream_rules_x86_64:
   rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/"'
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
 
 .nightly_rules_all:
   rules:
@@ -76,19 +76,16 @@ init:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.4-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.10-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
 
-.ga/eus_rules_all:
+.ga_rules_all:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $NIGHTLY== "false"'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $NIGHTLY == "false"'
 
-.ga/eus_rules_x86_64:
+.ga_rules_x86_64:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY== "false"'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "false"'
 
-.ga/eus_rules_exclude:
-  rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
 
 .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL
   RUNNER:
@@ -104,8 +101,7 @@ RPM:
   extends: .terraform
   rules:
     - !reference [.build_rules, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - sh "schutzbot/mockbuild.sh"
   parallel:
@@ -146,7 +142,7 @@ Container:
   stage: rpmbuild
   extends: .terraform
   rules:
-    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - sh "schutzbot/containerbuild.sh"
   parallel:
@@ -158,7 +154,7 @@ Packer:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - tools/ci-build-worker-packer.sh
   variables:
@@ -191,8 +187,7 @@ Base:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/base_tests.sh
@@ -226,8 +221,7 @@ Base:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -275,12 +269,13 @@ regression-composer-works-behind-satellite:
 
 regression-excluded-dependency:
   extends: .regression
-  rules: 
+  rules:
+    # BLACKLIST: Skipped on RHEL GA for pull requests
+    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     # WHITELIST
     - if: $RUNNER =~ "/^.*(rhel-8.*|rhel-9.*|centos-stream-8|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   variables:
     SCRIPT: regression-excluded-dependency.sh
 
@@ -289,15 +284,16 @@ regression-include-excluded-packages:
   rules: 
     # BLACKLIST: Skipped on fedora systems
     - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    # BLACKLIST: Skipped on RHEL GA for pull requests
+    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   variables:
     SCRIPT: regression-include-excluded-packages.sh
 
 regression-old-worker-new-composer:
   rules:
-    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga_rules_all, rules]
   parallel:
     matrix:
       - RUNNER:
@@ -313,9 +309,10 @@ regression-insecure-repo:
   rules:
     # WHITELIST
     - if: $RUNNER =~ "/^.*(rhel-*).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    # BLACKLIST: Skipped on RHEL GA for pull requests
+    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   variables:
     SCRIPT: regression-insecure-repo.sh
 
@@ -325,9 +322,10 @@ regression-no-explicit-rootfs-definition:
   rules: 
     # BLACKLIST: Skipped on fedora systems
     - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    # BLACKLIST: Skipped on RHEL GA for pull requests
+    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   variables:
     SCRIPT: regression-no-explicit-rootfs-definition.sh
 
@@ -366,8 +364,7 @@ Trigger-rhel-edge-ci:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -413,7 +410,7 @@ koji.sh (cloud upload):
   stage: test
   extends: .terraform
   rules:
-    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh cloud-upload ${CLOUD_TARGET} ${IMAGE_TYPE}
@@ -443,8 +440,7 @@ koji.sh (cloudapi):
   # Not supported in nightly pipelines
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   variables:
     SCRIPT: koji.sh
   parallel:
@@ -462,6 +458,8 @@ aws.sh:
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.4-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.10-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
+    # BLACKLIST: Skipped on RHEL GA for pull requests
+    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
   variables:
     SCRIPT: aws.sh
 
@@ -470,8 +468,7 @@ oci.sh:
   rules:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_x86_64, rules]
   variables:
     SCRIPT: oci.sh
 
@@ -493,8 +490,7 @@ azure.sh:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_x86_64, rules]
   variables:
     SCRIPT: azure.sh
 
@@ -504,8 +500,7 @@ azure.sh_hyperv_gen2:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_x86_64, rules]
   variables:
     SCRIPT: azure_hyperv_gen2.sh
 
@@ -515,8 +510,7 @@ gcp.sh:
   rules: 
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_x86_64, rules]
   variables:
     SCRIPT: gcp.sh
 
@@ -526,8 +520,7 @@ vmware.sh_vmdk:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_x86_64, rules]
   variables:
     SCRIPT: vmware.sh vmdk
 
@@ -537,8 +530,7 @@ vmware.sh_ova:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_x86_64, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_x86_64, rules]
   variables:
     SCRIPT: vmware.sh ova
 
@@ -576,8 +568,7 @@ API:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
     # note: cloud API is not supported for on-prem installations so
     # don't run this test case for nightly trees
   script:
@@ -611,8 +602,7 @@ API-module-hotfixes:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
     # note: cloud API is not supported for on-prem installations so
     # don't run this test case for nightly trees
   script:
@@ -640,8 +630,7 @@ API-module-hotfixes:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -670,8 +659,7 @@ ubi-wsl.sh:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/ubi-wsl.sh
@@ -685,8 +673,7 @@ weldr-distro-dot-notation+aliases:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/weldr-distro-dot-notation-and-aliases.sh
@@ -702,9 +689,10 @@ weldr-distro-dot-notation+aliases:
   rules:
     # BLACKLIST
     - if: $RUNNER !~ "/^.*(rhel-8.10|rhel-9.4).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true"
+    # BLACKLIST: Skipped on RHEL GA for pull requests
+    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
 
 generic_s3_http.sh:
   extends: .generic_s3
@@ -731,8 +719,7 @@ RHEL 9 on 8:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh
@@ -809,8 +796,7 @@ Installer:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/installers.sh
@@ -826,8 +812,7 @@ ContainerUpload:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/container-upload.sh
@@ -843,8 +828,7 @@ ContainerEmbedding:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/container-embedding.sh
@@ -864,8 +848,7 @@ WorkerExecutor:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.ga/eus_rules_all, rules]
-    - !reference [.ga/eus_rules_exclude, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/worker-executor.sh

diff --git a/schutzbot/slack_notification.sh b/schutzbot/slack_notification.sh
@@ -10,7 +10,7 @@ fi
 COMPOSE_ID=$(cat COMPOSE_ID)
 COMPOSER_NVR=$(cat COMPOSER_NVR)
 if [ "$3" == "ga" ]; then
-    MESSAGE="\"Nightly GA/EUS releases pipeline execution finished with status *$1* $2 \n QE: @atodorov, @jrusz, @tkosciel\n Link to results: $CI_PIPELINE_URL \""
+    MESSAGE="\"GA/EUS composes pipeline execution finished with status *$1* $2 \n QE: @atodorov, @jrusz, @tkosciel\n Link to results: $CI_PIPELINE_URL \""
 else
     MESSAGE="\"Nightly pipeline execution on *$COMPOSE_ID* with *$COMPOSER_NVR* finished with status *$1* $2 \n QE: @atodorov, @jrusz, @tkosciel\n Link to results: $CI_PIPELINE_URL\n For edge testing status please see https://url.corp.redhat.com/edge-pipelines \""
 fi