From c4194d1dbfbf0e41aea920e69883fd7b1216afe3 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Thu, 28 Mar 2024 14:25:23 +0100
Subject: [PATCH 01/12] Create new nightly pipeline for GA/EUS images

---
 .gitlab-ci.yml                  | 81 ++++++++++++++++++++++++++++++---
 schutzbot/slack_notification.sh |  6 ++-
 2 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8cdd25cbe4..6f958a9443 100644
--- 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:
@@ -74,6 +74,15 @@ init:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
 
+.nightly_rules_ga/eus:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $NIGHTLY_GA== "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $NIGHTLY_GA == "true"'
+
+.nightly_rules_ga/eus_x86_64:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY_GA== "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY_GA == "true"'
 
 .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL
   RUNNER:
@@ -121,11 +130,28 @@ Build -tests RPM for RHEL:
     matrix:
       - <<: *RPM_RUNNERS_RHEL
 
+RPM for RHEL-GA:
+  stage: rpmbuild
+  extends: .terraform
+  rules:
+    - !reference [.nightly_rules_ga/eus, rules]
+  script:
+    - sh "schutzbot/mockbuild.sh"
+  parallel:
+    matrix:
+      - RUNNER:
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
+          - aws/rhel-8.9-ga-x86_64
+          - aws/rhel-8.9-ga-aarch64
+          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-9.3-ga-aarch64
+
 Container:
   stage: rpmbuild
   extends: .terraform
   rules:
-    - !reference [.build_rules, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - sh "schutzbot/containerbuild.sh"
   parallel:
@@ -137,7 +163,7 @@ Packer:
   stage: test
   extends: .terraform
   rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - tools/ci-build-worker-packer.sh
   variables:
@@ -169,6 +195,7 @@ Base:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/base_tests.sh
@@ -196,6 +223,7 @@ Base:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -252,6 +280,8 @@ regression-include-excluded-packages:
     SCRIPT: regression-include-excluded-packages.sh
 
 regression-old-worker-new-composer:
+  rules:
+    - !reference [.nightly_rules_ga/eus, rules]
   parallel:
     matrix:
       - RUNNER:
@@ -314,6 +344,7 @@ Trigger-rhel-edge-ci:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -355,7 +386,7 @@ koji.sh (cloud upload):
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh cloud-upload ${CLOUD_TARGET} ${IMAGE_TYPE}
@@ -385,6 +416,7 @@ koji.sh (cloudapi):
   # Not supported in nightly pipelines
   rules:
     - !reference [.upstream_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   variables:
     SCRIPT: koji.sh
   parallel:
@@ -409,6 +441,7 @@ oci.sh:
   rules:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
+    - !reference [.nightly_rules_ga/eus_x86_64, rules]
   variables:
     SCRIPT: oci.sh
 
@@ -430,6 +463,7 @@ azure.sh:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
+    - !reference [.nightly_rules_ga/eus_x86_64, rules]
   variables:
     SCRIPT: azure.sh
 
@@ -439,6 +473,7 @@ azure.sh_hyperv_gen2:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
+    - !reference [.nightly_rules_ga/eus_x86_64, rules]
   variables:
     SCRIPT: azure_hyperv_gen2.sh
 
@@ -448,6 +483,7 @@ gcp.sh:
   rules: 
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
+    - !reference [.nightly_rules_ga/eus_x86_64, rules]
   variables:
     SCRIPT: gcp.sh
 
@@ -457,6 +493,7 @@ vmware.sh_vmdk:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
+    - !reference [.nightly_rules_ga/eus_x86_64, rules]
   variables:
     SCRIPT: vmware.sh vmdk
 
@@ -466,6 +503,7 @@ vmware.sh_ova:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
+    - !reference [.nightly_rules_ga/eus_x86_64, rules]
   variables:
     SCRIPT: vmware.sh ova
 
@@ -501,6 +539,7 @@ API:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
     # note: cloud API is not supported for on-prem installations so
     # don't run this test case for nightly trees
   script:
@@ -532,6 +571,7 @@ API-module-hotfixes:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
     # note: cloud API is not supported for on-prem installations so
     # don't run this test case for nightly trees
   script:
@@ -559,6 +599,7 @@ API-module-hotfixes:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -584,6 +625,7 @@ ubi-wsl.sh:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/ubi-wsl.sh
@@ -600,6 +642,7 @@ weldr-distro-dot-notation+aliases:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/weldr-distro-dot-notation-and-aliases.sh
@@ -642,6 +685,7 @@ RHEL 9 on 8:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh
@@ -682,7 +726,7 @@ NIGHTLY_FAIL:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY == "true"'
       when: on_failure
   script:
-    - schutzbot/slack_notification.sh FAILED ":big-sad:"
+    - schutzbot/slack_notification.sh FAILED ":big-sad:" rhel
 
 NIGHTLY_SUCCESS:
   stage: finish
@@ -691,7 +735,26 @@ NIGHTLY_SUCCESS:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY == "true"'
   script:
-    - schutzbot/slack_notification.sh SUCCESS ":partymeow:"
+    - schutzbot/slack_notification.sh SUCCESS ":partymeow:" rhel
+
+NIGHTLY_GA/EUS_FAIL:
+  stage: finish
+  tags:
+    - shell
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY_GA== "true"'
+      when: on_failure
+  script:
+    - schutzbot/slack_notification.sh FAILED ":big-sad:" ga
+
+NIGHTLY_GA/EUS_SUCCESS:
+  stage: finish
+  tags:
+    - shell
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY_GA== "true"'
+  script:
+    - schutzbot/slack_notification.sh SUCCESS ":partymeow:" ga
 
 Installer:
   stage: test
@@ -699,6 +762,7 @@ Installer:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/installers.sh
@@ -713,6 +777,7 @@ ContainerUpload:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/container-upload.sh
@@ -727,6 +792,7 @@ ContainerEmbedding:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/container-embedding.sh
@@ -743,6 +809,7 @@ WorkerExecutor:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
+    - !reference [.nightly_rules_ga/eus, 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
index 090754f701..ab77b3a38d 100755
--- a/schutzbot/slack_notification.sh
+++ b/schutzbot/slack_notification.sh
@@ -9,7 +9,11 @@ fi
 
 COMPOSE_ID=$(cat COMPOSE_ID)
 COMPOSER_NVR=$(cat COMPOSER_NVR)
-MESSAGE="\"Nightly pipeline execution on *$COMPOSE_ID* with *$COMPOSER_NVR* finished with status *$1* $2 \n QE: @atodorov, @jrusz\n Link to results: $CI_PIPELINE_URL\n For edge testing status please see https://url.corp.redhat.com/edge-pipelines \""
+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 \""
+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
 
 curl \
     -X POST \

From 0a731f56f6f8992790877f1f3856792c4610569b Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Mon, 29 Apr 2024 10:13:29 +0200
Subject: [PATCH 02/12] Add exclude rule and rename the pipeline

---
 .gitlab-ci.yml | 121 ++++++++++++++++++++++++++++---------------------
 1 file changed, 70 insertions(+), 51 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f958a9443..c133614ee7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,11 +60,11 @@ init:
 
 .upstream_rules_all:
   rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
 
 .upstream_rules_x86_64:
   rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/"'
 
 .nightly_rules_all:
   rules:
@@ -74,15 +74,19 @@ init:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
 
-.nightly_rules_ga/eus:
+.ga/eus_rules_all:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $NIGHTLY_GA== "true"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $NIGHTLY_GA == "true"'
+    - 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"'
 
-.nightly_rules_ga/eus_x86_64:
+.ga/eus_rules_x86_64:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY_GA== "true"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY_GA == "true"'
+    - 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:
@@ -96,6 +100,8 @@ RPM:
   extends: .terraform
   rules:
     - !reference [.build_rules, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - sh "schutzbot/mockbuild.sh"
   parallel:
@@ -130,28 +136,11 @@ Build -tests RPM for RHEL:
     matrix:
       - <<: *RPM_RUNNERS_RHEL
 
-RPM for RHEL-GA:
-  stage: rpmbuild
-  extends: .terraform
-  rules:
-    - !reference [.nightly_rules_ga/eus, rules]
-  script:
-    - sh "schutzbot/mockbuild.sh"
-  parallel:
-    matrix:
-      - RUNNER:
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-8.9-ga-aarch64
-          - aws/rhel-9.3-ga-x86_64
-          - aws/rhel-9.3-ga-aarch64
-
 Container:
   stage: rpmbuild
   extends: .terraform
   rules:
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
   script:
     - sh "schutzbot/containerbuild.sh"
   parallel:
@@ -163,7 +152,7 @@ Packer:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
   script:
     - tools/ci-build-worker-packer.sh
   variables:
@@ -195,7 +184,8 @@ Base:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/base_tests.sh
@@ -223,7 +213,8 @@ Base:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -267,6 +258,8 @@ regression-excluded-dependency:
     # WHITELIST
     - if: $RUNNER =~ "/^.*(rhel-8.*|rhel-9.*|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
     - !reference [.nightly_rules_all, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: regression-excluded-dependency.sh
 
@@ -276,12 +269,14 @@ regression-include-excluded-packages:
     # BLACKLIST: Skipped on fedora systems
     - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule"
     - !reference [.nightly_rules_all, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: regression-include-excluded-packages.sh
 
 regression-old-worker-new-composer:
   rules:
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
   parallel:
     matrix:
       - RUNNER:
@@ -298,6 +293,8 @@ regression-insecure-repo:
     # WHITELIST
     - if: $RUNNER =~ "/^.*(rhel-*).*$/" && $CI_PIPELINE_SOURCE != "schedule"
     - !reference [.nightly_rules_all, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: regression-insecure-repo.sh
 
@@ -308,6 +305,8 @@ regression-no-explicit-rootfs-definition:
     # BLACKLIST: Skipped on fedora systems
     - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule"
     - !reference [.nightly_rules_all, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: regression-no-explicit-rootfs-definition.sh
 
@@ -344,7 +343,8 @@ Trigger-rhel-edge-ci:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -386,7 +386,7 @@ koji.sh (cloud upload):
   stage: test
   extends: .terraform
   rules:
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh cloud-upload ${CLOUD_TARGET} ${IMAGE_TYPE}
@@ -416,7 +416,8 @@ koji.sh (cloudapi):
   # Not supported in nightly pipelines
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: koji.sh
   parallel:
@@ -441,7 +442,8 @@ oci.sh:
   rules:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
-    - !reference [.nightly_rules_ga/eus_x86_64, rules]
+    - !reference [.ga/eus_rules_x86_64, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: oci.sh
 
@@ -463,7 +465,8 @@ azure.sh:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.nightly_rules_ga/eus_x86_64, rules]
+    - !reference [.ga/eus_rules_x86_64, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: azure.sh
 
@@ -473,7 +476,8 @@ azure.sh_hyperv_gen2:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.nightly_rules_ga/eus_x86_64, rules]
+    - !reference [.ga/eus_rules_x86_64, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: azure_hyperv_gen2.sh
 
@@ -483,7 +487,8 @@ gcp.sh:
   rules: 
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.nightly_rules_ga/eus_x86_64, rules]
+    - !reference [.ga/eus_rules_x86_64, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: gcp.sh
 
@@ -493,7 +498,8 @@ vmware.sh_vmdk:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.nightly_rules_ga/eus_x86_64, rules]
+    - !reference [.ga/eus_rules_x86_64, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: vmware.sh vmdk
 
@@ -503,7 +509,8 @@ vmware.sh_ova:
     # Run only on x86_64
     - !reference [.upstream_rules_x86_64, rules]
     - !reference [.nightly_rules_x86_64, rules]
-    - !reference [.nightly_rules_ga/eus_x86_64, rules]
+    - !reference [.ga/eus_rules_x86_64, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   variables:
     SCRIPT: vmware.sh ova
 
@@ -539,7 +546,8 @@ API:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
     # note: cloud API is not supported for on-prem installations so
     # don't run this test case for nightly trees
   script:
@@ -571,7 +579,8 @@ API-module-hotfixes:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
     # note: cloud API is not supported for on-prem installations so
     # don't run this test case for nightly trees
   script:
@@ -599,7 +608,8 @@ API-module-hotfixes:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -625,7 +635,8 @@ ubi-wsl.sh:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/ubi-wsl.sh
@@ -642,7 +653,8 @@ weldr-distro-dot-notation+aliases:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/weldr-distro-dot-notation-and-aliases.sh
@@ -659,6 +671,8 @@ weldr-distro-dot-notation+aliases:
     # BLACKLIST
     - if: $RUNNER !~ "/^.*(rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true"
     - !reference [.nightly_rules_all, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
 
 generic_s3_http.sh:
   extends: .generic_s3
@@ -685,7 +699,8 @@ RHEL 9 on 8:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh
@@ -742,7 +757,7 @@ NIGHTLY_GA/EUS_FAIL:
   tags:
     - shell
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY_GA== "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY== "false"'
       when: on_failure
   script:
     - schutzbot/slack_notification.sh FAILED ":big-sad:" ga
@@ -752,7 +767,7 @@ NIGHTLY_GA/EUS_SUCCESS:
   tags:
     - shell
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY_GA== "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY== "false"'
   script:
     - schutzbot/slack_notification.sh SUCCESS ":partymeow:" ga
 
@@ -762,7 +777,8 @@ Installer:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/installers.sh
@@ -777,7 +793,8 @@ ContainerUpload:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/container-upload.sh
@@ -792,7 +809,8 @@ ContainerEmbedding:
   rules:
     - !reference [.upstream_rules_all, rules]
     - !reference [.nightly_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/container-embedding.sh
@@ -809,7 +827,8 @@ WorkerExecutor:
   extends: .terraform
   rules:
     - !reference [.upstream_rules_all, rules]
-    - !reference [.nightly_rules_ga/eus, rules]
+    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga/eus_rules_exclude, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/worker-executor.sh

From c08d2ab29c360dcb668a681f0cb029184c415217 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Mon, 29 Apr 2024 10:15:00 +0200
Subject: [PATCH 03/12] Rename the slack jobs

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c133614ee7..236024ba15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -752,7 +752,7 @@ NIGHTLY_SUCCESS:
   script:
     - schutzbot/slack_notification.sh SUCCESS ":partymeow:" rhel
 
-NIGHTLY_GA/EUS_FAIL:
+GA/EUS_FAIL:
   stage: finish
   tags:
     - shell
@@ -762,7 +762,7 @@ NIGHTLY_GA/EUS_FAIL:
   script:
     - schutzbot/slack_notification.sh FAILED ":big-sad:" ga
 
-NIGHTLY_GA/EUS_SUCCESS:
+GA/EUS_SUCCESS:
   stage: finish
   tags:
     - shell

From b2e46204ad954e820abe64b8442c9aa981b073ac Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Mon, 29 Apr 2024 10:28:43 +0200
Subject: [PATCH 04/12] Change parameters in slack notification

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 236024ba15..20925e8335 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -741,7 +741,7 @@ NIGHTLY_FAIL:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY == "true"'
       when: on_failure
   script:
-    - schutzbot/slack_notification.sh FAILED ":big-sad:" rhel
+    - schutzbot/slack_notification.sh FAILED ":big-sad:" nightly
 
 NIGHTLY_SUCCESS:
   stage: finish
@@ -750,7 +750,7 @@ NIGHTLY_SUCCESS:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY == "true"'
   script:
-    - schutzbot/slack_notification.sh SUCCESS ":partymeow:" rhel
+    - schutzbot/slack_notification.sh SUCCESS ":partymeow:" nightly
 
 GA/EUS_FAIL:
   stage: finish

From 3bb3b3b1e0772ca0fbd7e6cd0f6ec0e5737dd2e0 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Tue, 30 Apr 2024 14:04:53 +0200
Subject: [PATCH 05/12] Add old GA exclusion, rename pipeline and add
 exceptions on jobs

---
 .gitlab-ci.yml                  | 113 ++++++++++++++------------------
 schutzbot/slack_notification.sh |   2 +-
 2 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20925e8335..31ab4b3881 100644
--- 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:
@@ -74,19 +74,16 @@ init:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
 
-.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:
@@ -100,8 +97,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:
@@ -117,6 +113,8 @@ RPM:
           - aws/rhel-8.9-ga-aarch64
           - aws/rhel-9.3-ga-x86_64
           - aws/rhel-9.3-ga-aarch64
+          - aws/centos-stream-8-x86_64
+          - aws/centos-stream-8-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
       - <<: *RPM_RUNNERS_RHEL
@@ -140,7 +138,7 @@ Container:
   stage: rpmbuild
   extends: .terraform
   rules:
-    - !reference [.ga/eus_rules_all, rules]
+    - !reference [.ga_rules_all, rules]
   script:
     - sh "schutzbot/containerbuild.sh"
   parallel:
@@ -152,7 +150,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:
@@ -184,8 +182,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
@@ -213,8 +210,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}
@@ -254,12 +250,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-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
 
@@ -268,15 +265,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:
@@ -292,9 +290,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
 
@@ -304,9 +303,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
 
@@ -343,8 +343,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}
@@ -386,7 +385,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}
@@ -416,8 +415,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:
@@ -434,6 +432,8 @@ aws.sh:
     # Skip rhel-8.4-ga-x86_64
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    # BLACKLIST: Skipped on RHEL GA for pull requests
+    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
   variables:
     SCRIPT: aws.sh
 
@@ -442,8 +442,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
 
@@ -465,8 +464,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
 
@@ -476,8 +474,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
 
@@ -487,8 +484,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
 
@@ -498,8 +494,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
 
@@ -509,8 +504,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
 
@@ -546,8 +540,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:
@@ -579,8 +572,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:
@@ -608,8 +600,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}
@@ -635,8 +626,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
@@ -653,8 +643,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
@@ -670,9 +659,10 @@ weldr-distro-dot-notation+aliases:
   rules:
     # BLACKLIST
     - if: $RUNNER !~ "/^.*(rhel-9.5).*$/" && $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
@@ -699,8 +689,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
@@ -777,8 +766,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
@@ -793,8 +781,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
@@ -809,8 +796,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
@@ -827,8 +813,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
index ab77b3a38d..7fc9982d32 100755
--- 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

From f3e7466824f4169e7113d7290851c0d28793f151 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Thu, 2 May 2024 14:26:17 +0200
Subject: [PATCH 06/12] Exclude the GA jobs from PR pipeline - fix

---
 .gitlab-ci.yml | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31ab4b3881..9413305a88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,8 @@ init:
 
 .build_rules:
   rules:
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $SKIP_CI == "false"'
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $SKIP_CI == "true"'
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $SKIP_CI == "false" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $SKIP_CI == "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
       when: manual
 
 .upstream_rules_all:
@@ -251,8 +251,6 @@ regression-composer-works-behind-satellite:
 regression-excluded-dependency:
   extends: .regression
   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-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
     - !reference [.nightly_rules_all, rules]
@@ -264,9 +262,7 @@ regression-include-excluded-packages:
   extends: .regression
   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]+/
+    - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   variables:
@@ -289,9 +285,7 @@ regression-insecure-repo:
   extends: .regression
   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]+/
+    - if: $RUNNER =~ "/^.*(rhel-*).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   variables:
@@ -302,9 +296,7 @@ regression-no-explicit-rootfs-definition:
   extends: .regression
   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]+/
+    - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   variables:
@@ -430,10 +422,8 @@ aws.sh:
   extends: .integration
   rules:
     # Skip rhel-8.4-ga-x86_64
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/'
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/ && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
-    # BLACKLIST: Skipped on RHEL GA for pull requests
-    - if: $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
   variables:
     SCRIPT: aws.sh
 
@@ -658,9 +648,7 @@ weldr-distro-dot-notation+aliases:
   extends: .libvirt_integration
   rules:
     # BLACKLIST
-    - if: $RUNNER !~ "/^.*(rhel-9.5).*$/" && $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]+/
+    - if: $RUNNER !~ "/^.*(rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
 

From 6d30d81f4ef93d3d6c54dbf289e80a1daec08487 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Mon, 6 May 2024 10:54:49 +0200
Subject: [PATCH 07/12] Edit comments and simplify rule

---
 .gitlab-ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9413305a88..664e546515 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -251,8 +251,8 @@ regression-composer-works-behind-satellite:
 regression-excluded-dependency:
   extends: .regression
   rules:
-    # WHITELIST
-    - if: $RUNNER =~ "/^.*(rhel-8.*|rhel-9.*|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    # WHITELIST & BLACKLIST: excluding GA runners from the PR pipeline
+    - if: $RUNNER =~ "/^.*(rhel-8.*|rhel-9.*|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   variables:
@@ -261,7 +261,7 @@ regression-excluded-dependency:
 regression-include-excluded-packages:
   extends: .regression
   rules: 
-    # BLACKLIST: Skipped on fedora systems
+    # BLACKLIST: Skipped on fedora systems & excluding GA runners from the PR pipeline
     - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
@@ -284,7 +284,7 @@ regression-old-worker-new-composer:
 regression-insecure-repo:
   extends: .regression
   rules:
-    # WHITELIST
+    # WHITELIST & BLACKLIST: excluding GA runners from the PR pipeline
     - if: $RUNNER =~ "/^.*(rhel-*).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
@@ -295,7 +295,7 @@ regression-insecure-repo:
 regression-no-explicit-rootfs-definition:
   extends: .regression
   rules: 
-    # BLACKLIST: Skipped on fedora systems
+    # BLACKLIST: Skipped on fedora systems & excluding GA runners from the PR pipeline
     - if: $RUNNER !~ "/^.*(fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
@@ -421,8 +421,7 @@ koji.sh (cloudapi):
 aws.sh:
   extends: .integration
   rules:
-    # Skip rhel-8.4-ga-x86_64
-    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/ && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
   variables:
     SCRIPT: aws.sh
@@ -729,7 +728,7 @@ NIGHTLY_SUCCESS:
   script:
     - schutzbot/slack_notification.sh SUCCESS ":partymeow:" nightly
 
-GA/EUS_FAIL:
+GA_FAIL:
   stage: finish
   tags:
     - shell
@@ -739,7 +738,7 @@ GA/EUS_FAIL:
   script:
     - schutzbot/slack_notification.sh FAILED ":big-sad:" ga
 
-GA/EUS_SUCCESS:
+GA_SUCCESS:
   stage: finish
   tags:
     - shell

From d88668993aad949f2e107cd541a46197088cbc0c Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Mon, 6 May 2024 10:56:57 +0200
Subject: [PATCH 08/12] Rename slack notification message

---
 schutzbot/slack_notification.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schutzbot/slack_notification.sh b/schutzbot/slack_notification.sh
index 7fc9982d32..a97f682ccc 100755
--- 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="\"GA/EUS composes pipeline execution finished with status *$1* $2 \n QE: @atodorov, @jrusz, @tkosciel\n Link to results: $CI_PIPELINE_URL \""
+    MESSAGE="\"GA 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

From 3709d3fb7964a213f4d48b65199b5c88670184f4 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Tue, 25 Jun 2024 16:39:25 +0200
Subject: [PATCH 09/12] Return SaaS related tests back to PR pipeline

---
 .gitlab-ci.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 664e546515..4a8983bc2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,10 @@ init:
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
 
+.upstream_rules_ga_all:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER'
+
 .nightly_rules_all:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
@@ -270,6 +274,7 @@ regression-include-excluded-packages:
 
 regression-old-worker-new-composer:
   rules:
+    - !reference [.upstream_rules_ga_all, rules]
     - !reference [.ga_rules_all, rules]
   parallel:
     matrix:
@@ -377,6 +382,7 @@ koji.sh (cloud upload):
   stage: test
   extends: .terraform
   rules:
+    - !reference [.upstream_rules_ga_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
@@ -406,7 +412,7 @@ koji.sh (cloudapi):
   extends: .integration
   # Not supported in nightly pipelines
   rules:
-    - !reference [.upstream_rules_all, rules]
+    - !reference [.upstream_rules_ga_all, rules]
     - !reference [.ga_rules_all, rules]
   variables:
     SCRIPT: koji.sh
@@ -528,7 +534,7 @@ API:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_all, rules]
+    - !reference [.upstream_rules_ga_all, 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
@@ -560,7 +566,7 @@ API-module-hotfixes:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_all, rules]
+    - !reference [.upstream_rules_ga_all, 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
@@ -675,7 +681,7 @@ RHEL 9 on 8:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_all, rules]
+    - !reference [.upstream_rules_ga_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh

From 51bc58d3f4527504311b3de29aa100a83f87eba4 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Thu, 27 Jun 2024 10:30:07 +0200
Subject: [PATCH 10/12] Return Container and Packer jobs back to PR pipeline

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a8983bc2e..780322f57a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -142,6 +142,7 @@ Container:
   stage: rpmbuild
   extends: .terraform
   rules:
+    - !reference [.upstream_rules_ga_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - sh "schutzbot/containerbuild.sh"
@@ -154,6 +155,7 @@ Packer:
   stage: test
   extends: .terraform
   rules:
+    - !reference [.upstream_rules_ga_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - tools/ci-build-worker-packer.sh

From e4e1338fe92272de03ca64e2ae97a03c3bb2b1b2 Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Thu, 27 Jun 2024 14:19:12 +0200
Subject: [PATCH 11/12] Remove duplicit rules and update rules naming

---
 .gitlab-ci.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 780322f57a..623fc28191 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,7 @@ init:
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
 
-.upstream_rules_ga_all:
+.upstream_and_ga_rules_all:
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER'
 
@@ -80,12 +80,10 @@ init:
 
 .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_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"'
 
 
@@ -142,7 +140,7 @@ Container:
   stage: rpmbuild
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - sh "schutzbot/containerbuild.sh"
@@ -155,7 +153,7 @@ Packer:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - tools/ci-build-worker-packer.sh
@@ -276,7 +274,7 @@ regression-include-excluded-packages:
 
 regression-old-worker-new-composer:
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   parallel:
     matrix:
@@ -384,7 +382,7 @@ koji.sh (cloud upload):
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
@@ -414,7 +412,7 @@ koji.sh (cloudapi):
   extends: .integration
   # Not supported in nightly pipelines
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   variables:
     SCRIPT: koji.sh
@@ -536,7 +534,7 @@ API:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, 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
@@ -568,7 +566,7 @@ API-module-hotfixes:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, 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
@@ -683,7 +681,7 @@ RHEL 9 on 8:
   stage: test
   extends: .terraform
   rules:
-    - !reference [.upstream_rules_ga_all, rules]
+    - !reference [.upstream_and_ga_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh

From a8a5d78a54575b1b806ce881a11e382e0b2007ce Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Tue, 2 Jul 2024 12:37:40 +0200
Subject: [PATCH 12/12] Remove centos 8 runners

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 623fc28191..5c069eb64a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,8 +115,6 @@ RPM:
           - aws/rhel-8.9-ga-aarch64
           - aws/rhel-9.3-ga-x86_64
           - aws/rhel-9.3-ga-aarch64
-          - aws/centos-stream-8-x86_64
-          - aws/centos-stream-8-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
       - <<: *RPM_RUNNERS_RHEL