Test with rhel-9.6 nightly

.gitlab-ci.yml

@@ -72,12 +72,12 @@ init:
 
 .nightly_rules_all:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    - 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"'
 
 .nightly_rules_x86_64:
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    - 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"'
 
 .ga_rules_all:
@@ -91,8 +91,8 @@ init:
 
 .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL
   RUNNER:
-    - aws/rhel-9.5-nightly-x86_64
-    - aws/rhel-9.5-nightly-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
 
@@ -178,7 +178,7 @@ 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.5-nightly-x86_64
+          - aws/rhel-9.6-nightly-x86_64
           - aws/rhel-10.0-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
@@ -202,8 +202,8 @@ Base:
           - aws/rhel-9.4-ga-x86_64
           - aws/rhel-9.4-ga-aarch64
       - RUNNER:
-          - aws/rhel-9.5-nightly-x86_64
-          - aws/rhel-9.5-nightly-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/centos-stream-9-x86_64
@@ -232,8 +232,8 @@ Base:
           - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.4-ga-x86_64
           - aws/rhel-9.4-ga-aarch64
-          - aws/rhel-9.5-nightly-x86_64
-          - aws/rhel-9.5-nightly-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/centos-stream-9-x86_64
@@ -326,8 +326,8 @@ Image Tests:
       - RUNNER:
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
-          - aws/rhel-9.5-nightly-x86_64
-          - aws/rhel-9.5-nightly-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
         INTERNAL_NETWORK: ["true"]
@@ -357,7 +357,7 @@ Trigger-rhel-edge-ci:
     RUNNER:
       - aws/rhel-8.10-ga-x86_64
       - aws/rhel-9.4-ga-x86_64
-      - aws/rhel-9.5-nightly-x86_64
+      - aws/rhel-9.6-nightly-x86_64
       - aws/rhel-10.0-nightly-x86_64
       - aws/centos-stream-9-x86_64
       - aws/centos-stream-10-x86_64
@@ -455,7 +455,7 @@ OpenShift_Virtualization:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-9.5-nightly-x86_64
+          - aws/rhel-9.6-nightly-x86_64
           - aws/rhel-10.0-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
@@ -495,7 +495,7 @@ vmware.sh_vmdk:
     # Run only on x86_64
     # Temporarily disabled for RHEL-10 and Centos-10
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER !~ "/^.*(rhel-10.0-nightly|centos-stream-10).*$/"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
     # - !reference [.upstream_rules_x86_64, rules]
     # - !reference [.nightly_rules_x86_64, rules]
     - !reference [.ga_rules_x86_64, rules]
@@ -509,7 +509,7 @@ vmware.sh_ova:
     # Temporarily disabled for RHEL-10 and Centos-10
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER !~ "/^.*(rhel-10.0-nightly|centos-stream-10).*$/"'
     # - !reference [.upstream_rules_x86_64, rules]
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
     # - !reference [.nightly_rules_x86_64, rules]
     - !reference [.ga_rules_x86_64, rules]
   variables:
@@ -559,7 +559,7 @@ API:
         RUNNER:
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-9.4-ga-x86_64
-          - aws/rhel-9.5-nightly-x86_64
+          - aws/rhel-9.6-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       # el10 for now supports only a subset of image types
       - IMAGE_TYPE:
@@ -627,7 +627,7 @@ API-module-hotfixes:
       - RUNNER:
           - gcp/rhel-8.10-ga-x86_64
           - gcp/rhel-9.4-ga-x86_64
-          - gcp/rhel-9.5-nightly-x86_64
+          - gcp/rhel-9.6-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
@@ -670,14 +670,14 @@ weldr-distro-dot-notation+aliases:
     matrix:
       - RUNNER:
           - aws/rhel-8.8-ga-x86_64
-          - aws/rhel-9.5-nightly-x86_64
+          - aws/rhel-9.6-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 .generic_s3:
   extends: .libvirt_integration
   rules:
     # BLACKLIST
-    - if: $RUNNER !~ "/^.*(rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
+    - if: $RUNNER !~ "/^.*(rhel-9.6).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/
     - !reference [.nightly_rules_all, rules]
     - !reference [.ga_rules_all, rules]
 
@@ -752,7 +752,7 @@ Upgrade:
   parallel:
     matrix:
       - RUNNER:
-          - rhos-01/rhel-9.5-nightly-x86_64-large
+          - rhos-01/rhel-9.6-nightly-x86_64-large
           - rhos-01/rhel-10.0-nightly-x86_64-large
 
 NIGHTLY_FAIL:
@@ -806,7 +806,7 @@ Installer:
   parallel:
     matrix:
       - RUNNER:
-          - rhos-01/rhel-9.5-nightly-x86_64
+          - rhos-01/rhel-9.6-nightly-x86_64
           - rhos-01/centos-stream-9-x86_64
           - rhos-01/rhel-10.0-nightly-x86_64
           - rhos-01/centos-stream-10-x86_64
@@ -841,7 +841,7 @@ ContainerEmbedding:
         RUNNER:
         - aws/centos-stream-9-x86_64
         - aws/centos-stream-10-x86_64
-        - aws/rhel-9.5-nightly-x86_64
+        - aws/rhel-9.6-nightly-x86_64
         - aws/rhel-10.0-nightly-x86_64
 
 WorkerExecutor:

Schutzfile

@@ -2,7 +2,7 @@
   "fedora-39": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     },
     "repos": [
@@ -45,7 +45,7 @@
   "fedora-40": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     },
     "repos": [
@@ -88,56 +88,56 @@
   "rhel-8.4": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "rhel-8.8": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "rhel-8.9": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "rhel-8.10": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "rhel-9.2": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "rhel-9.3": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "rhel-9.4": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "rhel-9.5": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     },
     "repos": [
@@ -180,10 +180,56 @@
       }
     ]
   },
+  "rhel-9.6": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
+      }
+    },
+    "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.6-20241115"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.6-20241115"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.6-20241115"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.6-20241115"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.6-20241115"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.6-20241115"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-10.0": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     },
     "repos": [
@@ -229,14 +275,14 @@
   "centos-9": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "centos-stream-9": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     },
     "repos": [
@@ -282,14 +328,14 @@
   "centos-10": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     }
   },
   "centos-stream-10": {
     "dependencies": {
       "osbuild": {
-        "commit": "3df75de65a5414866fa43133309c1fc67490a373"
+        "commit": "ff0cd854c88de900e4fe62c8a0f24cbe2f2317ed"
       }
     },
     "repos": [

schutzbot/terraform

@@ -1 +1 @@
-b39783c2e634fa0aa0c77d31f9374bc71554db4e
+9c4a3c9573208bf66d8c91a95ee759a39ed0a556

test/cases/ostree-simplified-installer.sh

@@ -39,7 +39,7 @@ do
 done
 # Prepare service api server config filef
 sudo /usr/local/bin/yq -iy '.service_info.diskencryption_clevis |= [{disk_label: "/dev/vda4", reencrypt: true, binding: {pin: "tpm2", config: "{}"}}]' /etc/fdo/aio/configs/serviceinfo_api_server.yml
-if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
+if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
     # Modify manufacturing server config to process fdo
     # guest interface during onboarding
     sudo sed -i 's/SerialNumber/MACAddress/g' /etc/fdo/aio/configs/manufacturing_server.yml
@@ -622,7 +622,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
 diun_pub_key_insecure="true"
 EOF
 
-if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
+if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
     tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
 di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
 EOF
@@ -807,7 +807,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
 diun_pub_key_hash="${DIUN_PUB_KEY_HASH}"
 EOF
 
-if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
+if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
     tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
 di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
 EOF
@@ -992,7 +992,7 @@ diun_pub_key_root_certs="""
 ${DIUN_PUB_KEY_ROOT_CERTS}"""
 EOF
 
-if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
+if [[ "$VERSION_ID" == "9.6" || "$VERSION_ID" == "9" ]]; then
     tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
 di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
 EOF

test/cases/ostree.sh

@@ -56,7 +56,7 @@ case "${ID}-${VERSION_ID}" in
             BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
         fi
         ;;
-    "rhel-9.5")
+    "rhel-9.6")
         IMAGE_TYPE=edge-commit
         OSTREE_REF="rhel/9/${ARCH}/edge"
         OS_VARIANT="rhel9-unknown"