USHIFT-6519: RHEL 9.8 in bootc presubmits and periodics - remaining fixes

packaging/rpm/microshift.spec

@@ -64,8 +64,10 @@ BuildRequires: systemd
 BuildRequires: golang
 # DO NOT REMOVE
 
-Requires: cri-o >= 1.34.0, cri-o < 1.35.0
-Requires: cri-tools >= 1.34.0, cri-tools < 1.35.0
+# TODO: The cri-tools version is relaxed in the transition period.
+# It needs to be updated to match the cri-o version before the release.
+Requires: cri-o >= 1.35.0, cri-o < 1.36.0
+Requires: cri-tools >= 1.34.0, cri-tools < 1.36.0
 # The container networking plugins package has been removed from RHEL 10 and
 # cri-o no longer has an explicit dependency on it.
 # Ensure that the package is installed on RHEL 9 as a weak dependency, skipping

test/scenarios-bootc/presubmits/el96-yminus2@el96-src@upgrade-ok.sh → test/scenarios-bootc/presubmits/el96-yminus2@el98-src@upgrade-ok.sh

@@ -13,7 +13,7 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
     run_tests host1 \
-        --variable "TARGET_REF:rhel96-bootc-source" \
+        --variable "TARGET_REF:rhel98-bootc-source" \
         --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \
         suites/upgrade/upgrade-successful.robot
 }

test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh

@@ -15,10 +15,10 @@ scenario_run_tests() {
     prepare_static_delta rhel96-bootc-yminus2 rhel96-bootc-prel
     apply_static_delta   rhel96-bootc-yminus2 rhel96-bootc-prel
 
-    prepare_static_delta rhel96-bootc-prel rhel96-bootc-source
-    apply_static_delta   rhel96-bootc-prel rhel96-bootc-source
+    prepare_static_delta rhel96-bootc-prel rhel98-bootc-source
+    apply_static_delta   rhel96-bootc-prel rhel98-bootc-source
 
-    for ref in rhel96-bootc-prel-from-sdelta rhel96-bootc-source-from-sdelta ; do
+    for ref in rhel96-bootc-prel-from-sdelta rhel98-bootc-source-from-sdelta ; do
         run_tests host1 \
             --variable "TARGET_REF:${ref}" \
             --variable "BOOTC_REGISTRY:${MIRROR_REGISTRY_URL}" \

test/suites/upgrade/upgrade-fails-and-rolls-back.robot

@@ -29,14 +29,15 @@ New Deployment Is Consistently Unhealthy And Rolls Back
     Oc Create    configmap -n default unhealthy-upgrade-test
 
     TestAgent.Add Action For Next Deployment    every    ${REASON}
+
     Deploy Commit Expecting A Rollback
     ...    ${FAILING_REF}
     ...    True
     ...    ${BOOTC_REGISTRY}
 
     Wait For MicroShift Service
     Backup Should Exist    ${backup}
-    Expected Boot Count    5
+
     Oc Get    configmap    default    unhealthy-upgrade-test