Merge pull request #5075 from ggiguash/switch-to-419-released-repos

USHIFT-5627: Start using 4.19 released repos in common_versions.sh

Author: openshift-merge-bot[bot]

test/bin/common_versions.sh

@@ -72,8 +72,8 @@ export FAKE_NEXT_MINOR_VERSION=$(( "${MINOR_VERSION}" + 1 ))
 #
 # For a release branch, the current release repository should come from the
 # official 'rhocp' stream.
-CURRENT_RELEASE_REPO="" # "https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/microshift/ocp/latest-4.20/el9/os"
-CURRENT_RELEASE_VERSION="" # "$(get_vrel_from_beta "${CURRENT_RELEASE_REPO}")"
+CURRENT_RELEASE_REPO="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/microshift/ocp-dev-preview/latest-4.20/el9/os"
+CURRENT_RELEASE_VERSION="$(get_vrel_from_beta "${CURRENT_RELEASE_REPO}")"
 export CURRENT_RELEASE_REPO
 export CURRENT_RELEASE_VERSION
 
@@ -87,8 +87,8 @@ export CURRENT_RELEASE_VERSION
 #
 # For a release branch, the previous release repository should come from the
 # official 'rhocp' stream.
-PREVIOUS_RELEASE_REPO="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/microshift/ocp/latest-4.19/el9/os"
-PREVIOUS_RELEASE_VERSION="$(get_vrel_from_beta "${PREVIOUS_RELEASE_REPO}")"
+PREVIOUS_RELEASE_REPO="rhocp-4.19-for-rhel-9-$(uname -m)-rpms"
+PREVIOUS_RELEASE_VERSION="$(get_vrel_from_rhsm "${PREVIOUS_RELEASE_REPO}")"
 export PREVIOUS_RELEASE_REPO
 export PREVIOUS_RELEASE_VERSION
 
@@ -110,7 +110,7 @@ export RHOCP_MINOR_Y_BETA
 # If the release version is defined, the repository should be deduced from the
 # PREVIOUS_RELEASE_REPO setting.
 # Beta repository URL needs to be set for CentOS images as they don't have access to the RHOCP.
-RHOCP_MINOR_Y1=""
+RHOCP_MINOR_Y1=19
 RHOCP_MINOR_Y1_BETA="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.19-el9-beta/"
 export RHOCP_MINOR_Y1
 export RHOCP_MINOR_Y1_BETA

test/scenarios-bootc/periodics/[email protected] renamed to test/scenarios-bootc/periodics/[email protected]

@@ -10,7 +10,7 @@ scenario_create_vms() {
         return 0
     fi
     prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-prel
-    launch_vm --boot_blueprint rhel94-bootc
+    launch_vm --boot_blueprint rhel96-bootc
 }
 
 scenario_remove_vms() {

test/scenarios-bootc/periodics/el96-prel@[email protected]

@@ -59,7 +59,6 @@ Verify Multus Embedded Manifests
     [Documentation]    Delete Multus' DHCP Daemon and reboot host to make sure
     ...    it comes back even though the manifests do not exist anymore.
 
-    SSHLibrary.File Should Exist    /etc/greenboot/check/required.d/41_microshift_running_check_multus.sh
     SSHLibrary.File Should Exist    /etc/crio/crio.conf.d/12-microshift-multus.conf
     SSHLibrary.Directory Should Not Exist    /usr/lib/microshift/manifests.d/000-microshift-multus/