Merge pull request #5493 from ggiguash/upgrade-crio-version

USHIFT-6049: Upgrade cri-o and cri-tools version to 1.34

Author: openshift-merge-bot[bot]

packaging/rpm/microshift.spec

@@ -66,8 +66,8 @@ BuildRequires: systemd
 BuildRequires: golang
 # DO NOT REMOVE
 
-Requires: cri-o >= 1.33.0, cri-o < 1.34.0
-Requires: cri-tools >= 1.33.0, cri-tools < 1.34.0
+Requires: cri-o >= 1.34.0, cri-o < 1.35.0
+Requires: cri-tools >= 1.34.0, cri-tools < 1.35.0
 Requires: iptables
 Requires: microshift-selinux = %{version}
 Requires: microshift-networking = %{version}
@@ -807,6 +807,9 @@ fi
 # Use Git command to generate the log and replace the VERSION string
 # LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec
 %changelog
+* Thu Sep 18 2025 Gregory Giguashvili <[email protected]> 4.21.0
+- Upgrade cri-o and cri-tools to v1.34
+
 * Mon Aug 11 2025 Patryk Matuszak <[email protected]> 4.20.0
 - Remove healthcheck scripts: optional MicroShift workloads are now part of healthcheck command
 

scripts/devenv-builder/configure-vm.sh

@@ -212,26 +212,10 @@ EOF
         if [[ "${PREVIOUS_RHOCP}" =~ ^[0-9]{2} ]]; then
             sudo subscription-manager repos --enable "rhocp-4.${PREVIOUS_RHOCP}-for-rhel-9-$(uname -m)-rpms"
         else
-            # When its early in the new release cycle the previous release may not have a repo yet, use the beta.
-            PREVIOUS_RHOCP_BETA=$("${RHOCP_REPO}" $((ver-1)))
-            if [[ "${PREVIOUS_RHOCP_BETA}" =~ ^http ]]; then
-                prev_url=$(echo "${PREVIOUS_RHOCP_BETA}" | cut -d, -f1)
-                prev_ver=$(echo "${PREVIOUS_RHOCP_BETA}" | cut -d, -f2)
-                PREV_OCP_REPO_NAME="rhocp-4.${prev_ver}-for-rhel-9-mirrorbeta-$(uname -i)-rpms"
-                sudo tee "/etc/yum.repos.d/${PREV_OCP_REPO_NAME}.repo" >/dev/null <<EOF
-[${PREV_OCP_REPO_NAME}]
-name=Beta rhocp-4.${prev_ver} RPMs for RHEL 9
-baseurl=${prev_url}
-enabled=1
-gpgcheck=0
-skip_if_unavailable=0
-EOF
-            else
-                # If RHOCP Y-1 is not available, try RHOCP Y-2.
-                Y2_RHOCP=$("${RHOCP_REPO}" $((ver-2)))
-                if [[ "${Y2_RHOCP}" =~ ^[0-9]{2} ]]; then
-                    sudo subscription-manager repos --enable "rhocp-4.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
-                fi
+            # If RHOCP Y-1 is not available, try RHOCP Y-2.
+            Y2_RHOCP=$("${RHOCP_REPO}" $((ver-2)))
+            if [[ "${Y2_RHOCP}" =~ ^[0-9]{2} ]]; then
+                sudo subscription-manager repos --enable "rhocp-4.${Y2_RHOCP}-for-rhel-9-$(uname -m)-rpms"
             fi
         fi
     fi

test/bin/common_versions.sh

@@ -102,7 +102,7 @@ export YMINUS2_RELEASE_VERSION
 # If the release version is defined, the repository should be deduced from the
 # CURRENT_RELEASE_REPO setting.
 RHOCP_MINOR_Y=""
-RHOCP_MINOR_Y_BETA="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.20-el9-beta/"
+RHOCP_MINOR_Y_BETA="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.21-el9-beta/"
 export RHOCP_MINOR_Y
 export RHOCP_MINOR_Y_BETA