From 867ff9c06e636bfc2a4a6f28bdf3fd276a2546c7 Mon Sep 17 00:00:00 2001
From: Yi He <yih@yih-thinkpadt14gen4.nay.csb>
Date: Tue, 19 Nov 2024 15:47:28 +0800
Subject: [PATCH] ci: change to rhel 9.6

---
 test/cases/ostree-simplified-installer.sh |  8 ++++----
 test/cases/ostree.sh                      |  2 +-
 test/data/ansible/check-minimal.yaml      | 12 ++++++------
 tmt/plans/edge-test.fmf                   |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index 80805ae5a..b97ac96f8 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/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
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index 08fbd79b9..5830cd6c8 100755
--- a/test/cases/ostree.sh
+++ b/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"
diff --git a/test/data/ansible/check-minimal.yaml b/test/data/ansible/check-minimal.yaml
index 2f488ae95..76da8b3bc 100644
--- a/test/data/ansible/check-minimal.yaml
+++ b/test/data/ansible/check-minimal.yaml
@@ -58,25 +58,25 @@
           set_fact:
             failed_counter: "{{ failed_counter | int + 1 }}"
 
-    - name: add RHEL 9.5 BaseOS repository
+    - name: add RHEL 9.6 BaseOS repository
       yum_repository:
         name: baseos
         description: RHEL repository
-        baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.5.0/compose/BaseOS/{{ ansible_facts['architecture'] }}/os/"
+        baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.6.0/compose/BaseOS/{{ ansible_facts['architecture'] }}/os/"
         gpgcheck: no
         file: rhel_repo
       become: yes
-      when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.5', '==')
+      when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.6', '==')
 
-    - name: add RHEL 9.5 AppStream repository
+    - name: add RHEL 9.6 AppStream repository
       yum_repository:
         name: appstream
         description: RHEL repository
-        baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.5.0/compose/AppStream/{{ ansible_facts['architecture'] }}/os/"
+        baseurl: "http://{{ download_node }}/rhel-9/nightly/RHEL-9/latest-RHEL-9.6.0/compose/AppStream/{{ ansible_facts['architecture'] }}/os/"
         gpgcheck: no
         file: rhel_repo
       become: yes
-      when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.5', '==')
+      when: ansible_facts['distribution'] == 'RedHat' and ansible_facts ['distribution_version'] is version('9.6', '==')
 
     - name: add RHEL 8.10 BaseOS repository
       yum_repository:
diff --git a/tmt/plans/edge-test.fmf b/tmt/plans/edge-test.fmf
index 8c8235fb2..7c3bc1edf 100644
--- a/tmt/plans/edge-test.fmf
+++ b/tmt/plans/edge-test.fmf
@@ -88,7 +88,7 @@ provision:
       enabled: false
     - when: distro == fedora
       enabled: false
-    - when: distro == rhel-9-5
+    - when: distro == rhel-9-6
       enabled: false
 
 /edge-x86-minimal:
@@ -116,5 +116,5 @@ provision:
   adjust+:
     - when: distro == cs-9
       enabled: false
-    - when: distro == rhel-9-5
+    - when: distro == rhel-9-6
       enabled: false