.gitlab-ci.yml: switch to rhel 8.10 and 9.4 GA

osbuild · May 30, 2024 · b5c42f0 · b5c42f0
1 parent a96f1b6
commit b5c42f0
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 159 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -78,11 +78,11 @@ init:
 
 
 .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL
-  RUNNER:
-    - aws/rhel-8.10-nightly-x86_64
-    - aws/rhel-8.10-nightly-aarch64
-    - aws/rhel-9.4-nightly-x86_64
-    - aws/rhel-9.4-nightly-aarch64
+  RUNNER: []
+    # - aws/rhel-8.10-nightly-x86_64
+    # - aws/rhel-8.10-nightly-aarch64
+    # - aws/rhel-9.4-nightly-x86_64
+    # - aws/rhel-9.4-nightly-aarch64
 
   INTERNAL_NETWORK: ["true"]
 
@@ -102,10 +102,10 @@ RPM:
           - aws/fedora-39-aarch64
           - 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
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-x86_64
+          - aws/rhel-9.4-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
           - aws/centos-stream-9-x86_64
@@ -137,7 +137,7 @@ Container:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
 
 Packer:
   stage: test
@@ -147,7 +147,7 @@ Packer:
   script:
     - tools/ci-build-worker-packer.sh
   variables:
-    RUNNER: aws/rhel-9.3-ga-x86_64
+    RUNNER: aws/rhel-9.4-ga-x86_64
 
 Prepare-rhel-internal:
   stage: prepare-rhel-internal
@@ -166,8 +166,8 @@ Prepare-rhel-internal:
       - RUNNER:
           # NOTE: 1 runner prepares for all arches b/c subsequent jobs download
           # artifacts from all previous jobs and the last one wins
-          - aws/rhel-8.10-nightly-x86_64
-          - aws/rhel-9.4-nightly-x86_64
+          # - aws/rhel-8.10-nightly-x86_64
+          # - aws/rhel-9.4-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 Base:
@@ -188,17 +188,17 @@ Base:
           - aws/fedora-39-aarch64
           - 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
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-x86_64
+          - aws/rhel-9.4-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
-          - aws/rhel-8.10-nightly-x86_64
-          - aws/rhel-8.10-nightly-aarch64
-          - aws/rhel-9.4-nightly-x86_64
-          - aws/rhel-9.4-nightly-aarch64
+          # - aws/rhel-8.10-nightly-x86_64
+          # - aws/rhel-8.10-nightly-aarch64
+          # - aws/rhel-9.4-nightly-x86_64
+          # - aws/rhel-9.4-nightly-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
         INTERNAL_NETWORK: ["true"]
@@ -224,14 +224,14 @@ Base:
       - 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
-          - aws/rhel-8.10-nightly-x86_64
-          - aws/rhel-8.10-nightly-aarch64
-          - aws/rhel-9.4-nightly-x86_64
-          - aws/rhel-9.4-nightly-aarch64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-x86_64
+          - aws/rhel-9.4-ga-aarch64
+          # - aws/rhel-8.10-nightly-x86_64
+          # - aws/rhel-8.10-nightly-aarch64
+          # - aws/rhel-9.4-nightly-x86_64
+          # - aws/rhel-9.4-nightly-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
         INTERNAL_NETWORK: ["true"]
@@ -276,8 +276,8 @@ regression-old-worker-new-composer:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
   extends: .regression
   variables:
@@ -315,10 +315,10 @@ Image Tests:
       - RUNNER:
           - aws/rhel-8.4-ga-x86_64
           - aws/rhel-8.4-ga-aarch64
-          - aws/rhel-8.10-nightly-x86_64
-          - aws/rhel-8.10-nightly-aarch64
-          - aws/rhel-9.4-nightly-x86_64
-          - aws/rhel-9.4-nightly-aarch64
+          # - aws/rhel-8.10-nightly-x86_64
+          # - aws/rhel-8.10-nightly-aarch64
+          # - aws/rhel-9.4-nightly-x86_64
+          # - aws/rhel-9.4-nightly-aarch64
         INTERNAL_NETWORK: ["true"]
 
 Trigger-rhel-edge-ci:
@@ -345,12 +345,12 @@ Trigger-rhel-edge-ci:
     RUNNER:
       - aws/centos-stream-8-x86_64
       - aws/rhel-8.4-ga-x86_64
-      - aws/rhel-8.9-ga-x86_64
-      - aws/rhel-9.3-ga-x86_64
-      - aws/rhel-8.10-nightly-x86_64
-      - aws/rhel-8.10-nightly-aarch64
-      - aws/rhel-9.4-nightly-x86_64
-      - aws/rhel-9.4-nightly-aarch64
+      - aws/rhel-8.10-ga-x86_64
+      - aws/rhel-9.4-ga-x86_64
+      # - aws/rhel-8.10-nightly-x86_64
+      # - aws/rhel-8.10-nightly-aarch64
+      # - aws/rhel-9.4-nightly-x86_64
+      # - aws/rhel-9.4-nightly-aarch64
       - aws/centos-stream-9-x86_64
     INTERNAL_NETWORK: ["true"]
 
@@ -389,20 +389,20 @@ koji.sh (cloud upload):
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         CLOUD_TARGET: aws
         IMAGE_TYPE: aws-rhui
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         CLOUD_TARGET: azure
         IMAGE_TYPE: azure-rhui
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         CLOUD_TARGET: gcp
         IMAGE_TYPE: gcp-rhui
@@ -418,8 +418,8 @@ koji.sh (cloudapi):
     matrix:
       - *fedora_runners
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: ["true"]
 
 aws.sh:
@@ -449,7 +449,8 @@ OpenShift_Virtualization:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-9.4-nightly-x86_64
+          - aws/rhel-9.4-ga-x86_64
+          # - aws/rhel-9.4-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 azure.sh:
@@ -540,10 +541,10 @@ API:
     matrix:
       - <<: *API_TESTS
         RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
-          - aws/rhel-8.10-nightly-x86_64
-          - aws/rhel-9.4-nightly-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
+          # - aws/rhel-8.10-nightly-x86_64
+          # - aws/rhel-9.4-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       - IMAGE_TYPE: ["iot-commit"]
         RUNNER:
@@ -555,8 +556,8 @@ API:
           - aws/fedora-39-aarch64
       - IMAGE_TYPE: ["aws"]
         RUNNER:
-          - aws/rhel-8.9-ga-aarch64
-          - aws/rhel-9.3-ga-aarch64
+          - aws/rhel-8.10-ga-aarch64
+          - aws/rhel-9.4-ga-aarch64
         INTERNAL_NETWORK: ["true"]
 
 API-module-hotfixes:
@@ -574,14 +575,14 @@ API-module-hotfixes:
       - IMAGE_TYPE:
           - aws
         RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-8.9-ga-aarch64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
         INTERNAL_NETWORK: ["true"]
         TEST_MODULE_HOTFIXES: [1]
       - IMAGE_TYPE:
           - vsphere
         RUNNER:
-          - aws/rhel-8.9-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         TEST_MODULE_HOTFIXES: [1]
 
@@ -601,10 +602,10 @@ API-module-hotfixes:
           # - rhos-01/fedora-39-x86_64
       - RUNNER:
           - gcp/centos-stream-8-x86_64
-          - gcp/rhel-8.9-ga-x86_64
-          - gcp/rhel-9.3-ga-x86_64
-          - gcp/rhel-8.10-nightly-x86_64
-          - gcp/rhel-9.4-nightly-x86_64
+          - gcp/rhel-8.10-ga-x86_64
+          - gcp/rhel-9.4-ga-x86_64
+          # - gcp/rhel-8.10-nightly-x86_64
+          # - gcp/rhel-9.4-nightly-x86_64
           - gcp/centos-stream-9-x86_64
         INTERNAL_NETWORK: ["true"]
 
@@ -625,8 +626,8 @@ ubi-wsl.sh:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.9-ga-x86_64
-          - aws/rhel-9.3-ga-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-9.4-ga-x86_64
         INTERNAL_NETWORK: "true"
 
 weldr-distro-dot-notation+aliases:
@@ -641,8 +642,8 @@ weldr-distro-dot-notation+aliases:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.8-ga-x86_64
-          - aws/rhel-9.4-nightly-x86_64
+          - aws/rhel-8.10-ga-x86_64
+          # - aws/rhel-9.4-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 .generic_s3:
@@ -681,7 +682,7 @@ RHEL 9 on 8:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh
   variables:
-    RUNNER: aws/rhel-8.9-ga-x86_64
+    RUNNER: aws/rhel-8.10-ga-x86_64
     INTERNAL_NETWORK: "true"
     DISTRO_CODE: rhel-91
 
@@ -694,8 +695,7 @@ Multi-tenancy:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/multi-tenancy.sh
   variables:
-    # only 8.7 GA b/c the Image Builder service runs on RHEL 8
-    RUNNER: aws/rhel-8.9-ga-x86_64
+    RUNNER: aws/rhel-8.10-ga-x86_64
     INTERNAL_NETWORK: "true"
 
 Upgrade:
@@ -707,7 +707,8 @@ Upgrade:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/upgrade8to9.sh
   variables:
-    RUNNER: rhos-01/rhel-9.4-nightly-x86_64-large
+    RUNNER: rhos-01/rhel-9.4-ga-x86_64-large
+    # RUNNER: rhos-01/rhel-9.4-nightly-x86_64-large
 
 NIGHTLY_FAIL:
   stage: finish
@@ -740,8 +741,8 @@ Installer:
   parallel:
     matrix:
       - RUNNER:
-          - rhos-01/rhel-8.10-nightly-x86_64
-          - rhos-01/rhel-9.4-nightly-x86_64
+          # - rhos-01/rhel-8.10-nightly-x86_64
+          # - rhos-01/rhel-9.4-nightly-x86_64
           - rhos-01/centos-stream-9-x86_64
 
 ContainerUpload:
@@ -773,10 +774,10 @@ ContainerEmbedding:
         RUNNER:
         - aws/centos-stream-8-x86_64
         - aws/centos-stream-9-x86_64
-        - aws/rhel-8.10-nightly-x86_64
-        - aws/rhel-8.10-nightly-aarch64
-        - aws/rhel-9.4-nightly-x86_64
-        - aws/rhel-9.4-nightly-aarch64
+        # - aws/rhel-8.10-nightly-x86_64
+        # - aws/rhel-8.10-nightly-aarch64
+        # - aws/rhel-9.4-nightly-x86_64
+        # - aws/rhel-9.4-nightly-aarch64
 
 WorkerExecutor:
   stage: test