From f71b706e43cbf7d483d013ee27c561a2fe83ab3c Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Tue, 24 Feb 2026 08:31:44 +0200 Subject: [PATCH 1/6] Fix upgrade failed test not to hardcode rebootc count --- test/suites/upgrade/upgrade-fails-and-rolls-back.robot | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/suites/upgrade/upgrade-fails-and-rolls-back.robot b/test/suites/upgrade/upgrade-fails-and-rolls-back.robot index 8eb4bdb695..7cf51d7d72 100644 --- a/test/suites/upgrade/upgrade-fails-and-rolls-back.robot +++ b/test/suites/upgrade/upgrade-fails-and-rolls-back.robot @@ -29,6 +29,8 @@ New Deployment Is Consistently Unhealthy And Rolls Back Oc Create configmap -n default unhealthy-upgrade-test TestAgent.Add Action For Next Deployment every ${REASON} + + ${reboots}= Get Last Reboots Count Deploy Commit Expecting A Rollback ... ${FAILING_REF} ... True @@ -36,7 +38,12 @@ New Deployment Is Consistently Unhealthy And Rolls Back Wait For MicroShift Service Backup Should Exist ${backup} - Expected Boot Count 5 + + # Expect 2 more reboots: one for the new deployment and one for the rollback + ${cur_reboots}= Get Last Reboots Count + ${exp_reboots}= Evaluate ${reboots} + 2 + Should Be Equal As Integers ${cur_reboots} ${exp_reboots} + Oc Get configmap default unhealthy-upgrade-test From a3bb6724ee4b36301823bbf954dcbb51dca9a683 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Tue, 24 Feb 2026 08:34:22 +0200 Subject: [PATCH 2/6] Fix yminus2-to-src upgrade test --- ...96-src@upgrade-ok.sh => el96-yminus2@el98-src@upgrade-ok.sh} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/scenarios-bootc/presubmits/{el96-yminus2@el96-src@upgrade-ok.sh => el96-yminus2@el98-src@upgrade-ok.sh} (88%) diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@el96-src@upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-yminus2@el98-src@upgrade-ok.sh similarity index 88% rename from test/scenarios-bootc/presubmits/el96-yminus2@el96-src@upgrade-ok.sh rename to test/scenarios-bootc/presubmits/el96-yminus2@el98-src@upgrade-ok.sh index f32d0cf994..2eaee51b12 100644 --- a/test/scenarios-bootc/presubmits/el96-yminus2@el96-src@upgrade-ok.sh +++ b/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 } From 86429dadbad7dab38d3483693414fbcb3d083a72 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Tue, 24 Feb 2026 08:36:58 +0200 Subject: [PATCH 3/6] Fix yminus2-prel-src test --- .../presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh b/test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh index 1488ea92d6..80ca4ca5a5 100644 --- a/test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh +++ b/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}" \ From 566899127a3b53c0fe71946911f2fb83694dfd62 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Tue, 24 Feb 2026 09:40:41 +0200 Subject: [PATCH 4/6] Adjust cri-o and cri-tools required versions --- packaging/rpm/microshift.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 79718a8d26..56965e8df1 100644 --- a/packaging/rpm/microshift.spec +++ b/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 From 58c7d20cc154a01e0cd8cc780e0ae8a3fee6e984 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Tue, 24 Feb 2026 15:16:56 +0200 Subject: [PATCH 5/6] Remove reboot count check from the upgrade fail test --- test/suites/upgrade/upgrade-fails-and-rolls-back.robot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/suites/upgrade/upgrade-fails-and-rolls-back.robot b/test/suites/upgrade/upgrade-fails-and-rolls-back.robot index 7cf51d7d72..ef651a83ef 100644 --- a/test/suites/upgrade/upgrade-fails-and-rolls-back.robot +++ b/test/suites/upgrade/upgrade-fails-and-rolls-back.robot @@ -30,7 +30,6 @@ New Deployment Is Consistently Unhealthy And Rolls Back TestAgent.Add Action For Next Deployment every ${REASON} - ${reboots}= Get Last Reboots Count Deploy Commit Expecting A Rollback ... ${FAILING_REF} ... True @@ -39,11 +38,6 @@ New Deployment Is Consistently Unhealthy And Rolls Back Wait For MicroShift Service Backup Should Exist ${backup} - # Expect 2 more reboots: one for the new deployment and one for the rollback - ${cur_reboots}= Get Last Reboots Count - ${exp_reboots}= Evaluate ${reboots} + 2 - Should Be Equal As Integers ${cur_reboots} ${exp_reboots} - Oc Get configmap default unhealthy-upgrade-test From b82fa0432da078e04d0f4d475bd2ca18d4e621f9 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Tue, 24 Feb 2026 16:25:26 +0200 Subject: [PATCH 6/6] Temporarily disable upgrade-fails-then-recovers scenarios due to greenboot behavior change --- ...covers.sh => el98-src@upgrade-fails-then-recovers.sh.disabled} | 0 ...covers.sh => el96-src@upgrade-fails-then-recovers.sh.disabled} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/scenarios-bootc/presubmits/{el98-src@upgrade-fails-then-recovers.sh => el98-src@upgrade-fails-then-recovers.sh.disabled} (100%) rename test/scenarios/presubmits/{el96-src@upgrade-fails-then-recovers.sh => el96-src@upgrade-fails-then-recovers.sh.disabled} (100%) diff --git a/test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh b/test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled similarity index 100% rename from test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh rename to test/scenarios-bootc/presubmits/el98-src@upgrade-fails-then-recovers.sh.disabled diff --git a/test/scenarios/presubmits/el96-src@upgrade-fails-then-recovers.sh b/test/scenarios/presubmits/el96-src@upgrade-fails-then-recovers.sh.disabled similarity index 100% rename from test/scenarios/presubmits/el96-src@upgrade-fails-then-recovers.sh rename to test/scenarios/presubmits/el96-src@upgrade-fails-then-recovers.sh.disabled