tests/CI: Add runners for RHEL 9.7 and 10.1 (HMS-6278)

.gitlab-ci.yml

@@ -72,13 +72,13 @@ init:
 
 .nightly_rules_all:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.0-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9\.(6|7)-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.\.(0|1)-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
 
 .nightly_rules_x86_64:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.0-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9\.(6|7)-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-10.\.(0|1)-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "10"'
 
 .ga_rules_all:
   rules:
@@ -91,10 +91,10 @@ init:
 
 .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL
   RUNNER:
-    - aws/rhel-9.6-nightly-x86_64
-    - aws/rhel-9.6-nightly-aarch64
-    - aws/rhel-10.0-nightly-x86_64
-    - aws/rhel-10.0-nightly-aarch64
+    - aws/rhel-9.7-nightly-x86_64
+    - aws/rhel-9.7-nightly-aarch64
+    - aws/rhel-10.1-nightly-x86_64
+    - aws/rhel-10.1-nightly-aarch64
 
   INTERNAL_NETWORK: ["true"]
 
@@ -178,8 +178,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-9.6-nightly-x86_64
-          - aws/rhel-10.0-nightly-x86_64
+          - aws/rhel-9.7-nightly-x86_64
+          - aws/rhel-10.1-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 Base:
@@ -202,10 +202,10 @@ Base:
           - aws/rhel-9.5-ga-x86_64
           - aws/rhel-9.5-ga-aarch64
       - RUNNER:
-          - aws/rhel-9.6-nightly-x86_64
-          - aws/rhel-9.6-nightly-aarch64
-          - aws/rhel-10.0-nightly-x86_64
-          - aws/rhel-10.0-nightly-aarch64
+          - aws/rhel-9.7-nightly-x86_64
+          - aws/rhel-9.7-nightly-aarch64
+          - aws/rhel-10.1-nightly-x86_64
+          - aws/rhel-10.1-nightly-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
           - aws/centos-stream-10-x86_64
@@ -232,10 +232,10 @@ Base:
           - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.5-ga-x86_64
           - aws/rhel-9.5-ga-aarch64
-          - aws/rhel-9.6-nightly-x86_64
-          - aws/rhel-9.6-nightly-aarch64
-          - aws/rhel-10.0-nightly-x86_64
-          - aws/rhel-10.0-nightly-aarch64
+          - aws/rhel-9.7-nightly-x86_64
+          - aws/rhel-9.7-nightly-aarch64
+          - aws/rhel-10.1-nightly-x86_64
+          - aws/rhel-10.1-nightly-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
           - aws/centos-stream-10-x86_64
@@ -326,10 +326,10 @@ Image Tests:
       - RUNNER:
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
-          - aws/rhel-9.6-nightly-x86_64
-          - aws/rhel-9.6-nightly-aarch64
-          - aws/rhel-10.0-nightly-x86_64
-          - aws/rhel-10.0-nightly-aarch64
+          - aws/rhel-9.7-nightly-x86_64
+          - aws/rhel-9.7-nightly-aarch64
+          - aws/rhel-10.1-nightly-x86_64
+          - aws/rhel-10.1-nightly-aarch64
         INTERNAL_NETWORK: ["true"]
 
 Trigger-rhel-edge-ci:
@@ -357,8 +357,8 @@ Trigger-rhel-edge-ci:
     RUNNER:
       - aws/rhel-8.10-ga-x86_64
       - aws/rhel-9.5-ga-x86_64
-      - aws/rhel-9.6-nightly-x86_64
-      - aws/rhel-10.0-nightly-x86_64
+      - aws/rhel-9.7-nightly-x86_64
+      - aws/rhel-10.1-nightly-x86_64
       - aws/centos-stream-9-x86_64
       - aws/centos-stream-10-x86_64
     INTERNAL_NETWORK: ["true"]
@@ -455,8 +455,8 @@ OpenShift_Virtualization:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-9.6-nightly-x86_64
-          - aws/rhel-10.0-nightly-x86_64
+          - aws/rhel-9.7-nightly-x86_64
+          - aws/rhel-10.1-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 azure.sh:
@@ -532,11 +532,11 @@ filesystem.sh:
       - CUSTOMIZATION_TYPE: "disk-plain"
         RUNNER:
           - aws/rhel-9.5-ga-x86_64
-          - aws/rhel-10.0-nightly-x86_64
+          - aws/rhel-10.1-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       - CUSTOMIZATION_TYPE: "disk-lvm"
         RUNNER:
-          - aws/rhel-9.6-nightly-x86_64
+          - aws/rhel-9.7-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       - CUSTOMIZATION_TYPE: "disk-lvm"
         RUNNER:
@@ -580,7 +580,7 @@ API:
         RUNNER:
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-9.5-ga-x86_64
-          - aws/rhel-9.6-nightly-x86_64
+          - aws/rhel-9.7-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       # el10 for now supports only a subset of image types
       - IMAGE_TYPE:
@@ -590,7 +590,7 @@ API:
           - oci
           - vsphere
         RUNNER:
-          - aws/rhel-10.0-nightly-x86_64
+          - aws/rhel-10.1-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       - IMAGE_TYPE: ["iot-commit"]
         RUNNER:
@@ -649,10 +649,10 @@ API-module-hotfixes:
       - RUNNER:
           - gcp/rhel-8.10-ga-x86_64
           - gcp/rhel-9.5-ga-x86_64
-          - gcp/rhel-9.6-nightly-x86_64
+          - gcp/rhel-9.7-nightly-x86_64
           # TODO: replace the rhos-01 runner with this gcp runner once it's available
           # - gcp/rhel-10.0-nightly-x86_64
-          - rhos-01/rhel-10.0-nightly-x86_64
+          - rhos-01/rhel-10.1-nightly-x86_64
           - gcp/centos-stream-9-x86_64
         INTERNAL_NETWORK: ["true"]
 
@@ -676,7 +676,7 @@ ubi-wsl.sh:
       - RUNNER:
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-9.5-ga-x86_64
-          - aws/rhel-10.0-nightly-x86_64
+          - aws/rhel-10.1-nightly-x86_64
         INTERNAL_NETWORK: "true"
 
 weldr-distro-dot-notation+aliases:
@@ -693,14 +693,14 @@ weldr-distro-dot-notation+aliases:
     matrix:
       - RUNNER:
           - aws/rhel-8.8-ga-x86_64
-          - aws/rhel-9.6-nightly-x86_64
+          - aws/rhel-9.7-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 .generic_s3:
   extends: .libvirt_integration
   rules:
     # BLACKLIST
-    - if: $RUNNER !~ "/^.*(rhel-9.6).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
+    - if: $RUNNER !~ "/^.*(rhel-9.7).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
 
@@ -750,7 +750,7 @@ RHEL 10 on 9 (Koji):
   variables:
     RUNNER: aws/rhel-9.5-ga-x86_64
     INTERNAL_NETWORK: "true"
-    DISTRO_CODE: rhel-10.0
+    DISTRO_CODE: rhel-10.1
 
 Multi-tenancy:
   stage: test
@@ -775,8 +775,8 @@ Upgrade:
   parallel:
     matrix:
       - RUNNER:
-          - rhos-01/rhel-9.6-nightly-x86_64-large
-          - rhos-01/rhel-10.0-nightly-x86_64-large
+          - rhos-01/rhel-9.7-nightly-x86_64-large
+          - rhos-01/rhel-10.1-nightly-x86_64-large
 
 NIGHTLY_FAIL:
   stage: finish
@@ -821,20 +821,17 @@ Installer:
   extends: .terraform/openstack
   rules:
     - !reference [.upstream_rules_all, rules]
-    # Disable Installer test for RHEL 10.0 nightly pipeline because fix for dracut issue won't make to nightly composes
-    # For more info see: https://issues.redhat.com/browse/RHEL-80160
-    # - !reference [.nightly_rules_all, rules]
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/installers.sh
   parallel:
     matrix:
       - RUNNER:
-          - rhos-01/rhel-9.6-nightly-x86_64
+          - rhos-01/rhel-9.7-nightly-x86_64
           - rhos-01/centos-stream-9-x86_64
-          - rhos-01/rhel-10.0-nightly-x86_64
+          - rhos-01/rhel-10.1-nightly-x86_64
           - rhos-01/centos-stream-10-x86_64
 
 ContainerUpload:
@@ -867,8 +864,8 @@ ContainerEmbedding:
         RUNNER:
         - aws/centos-stream-9-x86_64
         - aws/centos-stream-10-x86_64
-        - aws/rhel-9.6-nightly-x86_64
-        - aws/rhel-10.0-nightly-x86_64
+        - aws/rhel-9.7-nightly-x86_64
+        - aws/rhel-10.1-nightly-x86_64
 
 WorkerExecutor:
   stage: test

Schutzfile

@@ -187,10 +187,56 @@
       }
     ]
   },
+  "rhel-9.7": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "59fe07a6ab37120b4dd532e972c26deb7e7c7383"
+      }
+    },
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/rhel9internal.repo",
+        "x86_64": [
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.7-20250428"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.7-20250428"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.7-20250428"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.7-20250428"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.7-20250428"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.7-20250428"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-10.0": {
     "dependencies": {
       "osbuild": {
-        "commit": "aced2eaa00b8f85608b36e294d13ad7ee9ac467d"
+        "commit": "59fe07a6ab37120b4dd532e972c26deb7e7c7383"
       }
     },
     "repos": [
@@ -233,6 +279,52 @@
       }
     ]
   },
+  "rhel-10.1": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "aced2eaa00b8f85608b36e294d13ad7ee9ac467d"
+      }
+    },
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/rhel10internal.repo",
+        "x86_64": [
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.1-20250501"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.1-20250501"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.1-20250501"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.1-20250501"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.1-20250501"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.1-20250501"
+          }
+        ]
+      }
+    ]
+  },
   "centos-9": {
     "dependencies": {
       "osbuild": {

schutzbot/team_ssh_keys.txt

@@ -18,3 +18,4 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKNh/u8oWHfYwr01X8G8ijSC3hPfKfLpK8MISxg2mq1O
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCWAwAqV3weCALKWrSAAHir+oIga1TU5VL4hnjWWU2x [email protected]
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOYiBGthrSNqUJdN9h9PHzXQL8cP8gj5pP9LZDx7BVgt/Knm9NwAe9hD/7fs9zmyECmZ5ubHDqG0x7Hb7DAjl+oPkCOxqRj5Npfvl1VRwwgXl3ymfI3JJpF7Cna4n0XdylBsTiwOL1/zoVXEJgTYEDEsP4gv65i8M/uWlsrfFwHLDEr3EQKnA0H4Ekz1CU2n9MFprX1hzA5IItozQUsYxKTPr1mxNTi1AFMhDEztMelvPO1OuC8MBZURR9S/+SlZ8ydCUcwl0gdCcgpUfouiuN9Yr9UbiV/yrAxEY3oKX8OegFmWEioUIZoFSiXl3sNP39ntOR4i+GV54g4omN6JbN3ios9LXBPMuvCy1NgFYPmDmmSEuo7n2IsP3pcXjZXpl4Ymwvn4RJviOZq8vghF5p0YMtCis1LxHL90epibxGoV6nc5isrOzqfgNUA9IS1zx7ZMoaF1PT8QcT8NzgNocrrhH4xGeTLD7WOOxykVASBnIXea8p7dl29/G0ThmS7Bc= [email protected]
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGQ5RGN0FtkkdhNZFQJMbh4+BXFoGon5ikrD3S1DRZ0+ [email protected]
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAQPQEtT/5PWH/NB5NstKSjrjfsrgHlFJMkEJ1ZbaMXs [email protected]

test/cases/api.sh

@@ -580,7 +580,13 @@ function sendCompose() {
                  --output "$OUTPUT" \
                  https://localhost/api/image-builder-composer/v2/compose)
 
+    if [ "$HTTPSTATUS" != "201" ]; then
+        redprint "Sending compose request failed:"
+        cat "$OUTPUT"
+    fi
+
     test "$HTTPSTATUS" = "201"
+
     COMPOSE_ID=$(jq -r '.id' "$OUTPUT")
 }