Merge pull request #3122 from yuwang-RH/fix1128

OCM-21111 | test: fix id: 45745

Author: openshift-merge-bot[bot]

tests/e2e/test_rosacli_operator_roles.go

@@ -1179,21 +1179,22 @@ var _ = Describe("Upgrade operator roles in auto mode",
 				Expect(err).To(BeNil())
 
 				By("Get cluster upgrade version")
-				versionService := rosaClient.Version
-				versionList, err := versionService.ListAndReflectVersions(rosacli.VersionChannelGroupCandidate, true)
+				output, err := upgradeService.ListUpgrades("-c", clusterID)
 				Expect(err).To(BeNil())
-				defaultVersion := versionList.DefaultVersion()
-				Expect(defaultVersion).ToNot(BeNil())
-				_, _, upgradeVersion, err := defaultVersion.MajorMinor()
+				upgradeVersionList, err := upgradeService.ReflectUpgradeVersionList(output)
+				Expect(err).To(BeNil())
+				Expect(len(upgradeVersionList.UpgradeVersions)).To(BeNumerically(">", 0),
+					"Expected at least one upgrade version to be available")
+				upgradingVersion := upgradeVersionList.UpgradeVersions[0].Version
+				_, _, roleUpgradeVersion, err := helper.GetMajorMinorFromVersion(upgradingVersion)
 				Expect(err).To(BeNil())
-				Expect(upgradeVersion).NotTo(BeEmpty())
 
 				By("Upgrade cluster to verify if there are any prompts to upgrade account roles firstly")
 				scheduledDate := time.Now().Format("2006-01-02")
 				scheduledTime := time.Now().Add(10 * time.Minute).UTC().Format("15:04")
-				output, err := upgradeService.Upgrade(
+				output, err = upgradeService.Upgrade(
 					"-c", clusterID,
-					"--version", defaultVersion.Version,
+					"--version", upgradingVersion,
 					"--schedule-date", scheduledDate,
 					"--schedule-time", scheduledTime,
 					"-m", "auto",
@@ -1206,16 +1207,16 @@ var _ = Describe("Upgrade operator roles in auto mode",
 				_, err = ocmResourceService.UpgradeAccountRole(
 					"--prefix", accountRolePrefix,
 					"--mode", "auto",
-					"--version", upgradeVersion,
+					"--version", roleUpgradeVersion,
 					"--channel-group", "candidate",
 					"-y",
 				)
 				Expect(err).To(BeNil())
 
 				By("Upgrade operator roles in auto mode")
 				output, err = ocmResourceService.UpgradeOperatorRoles(
-					"--cluster", clusterName,
-					"--version", defaultVersion.Version,
+					"--cluster", clusterID,
+					"--version", upgradingVersion,
 					"--mode", "auto",
 					"-y",
 				)
@@ -1224,49 +1225,33 @@ var _ = Describe("Upgrade operator roles in auto mode",
 					"policies"))
 				Expect(output.String()).To(ContainSubstring(
 					"policy/%s-openshift-image-registry-installer-cloud-credent' to version '%s'",
-					accountRolePrefix, upgradeVersion))
+					accountRolePrefix, roleUpgradeVersion))
 				Expect(output.String()).To(ContainSubstring(
 					"policy/%s-openshift-ingress-operator-cloud-credentials' to version '%s'",
-					accountRolePrefix, upgradeVersion))
+					accountRolePrefix, roleUpgradeVersion))
 				Expect(output.String()).To(ContainSubstring(
 					"policy/%s-openshift-cluster-csi-drivers-ebs-cloud-credenti' to version '%s'",
-					accountRolePrefix, upgradeVersion))
+					accountRolePrefix, roleUpgradeVersion))
 				Expect(output.String()).To(ContainSubstring(
 					"policy/%s-openshift-cloud-network-config-controller-cloud-' to version '%s'",
-					accountRolePrefix, upgradeVersion))
+					accountRolePrefix, roleUpgradeVersion))
 				Expect(output.String()).To(ContainSubstring(
 					"policy/%s-openshift-machine-api-aws-cloud-credentials' to version '%s'",
-					accountRolePrefix, upgradeVersion))
+					accountRolePrefix, roleUpgradeVersion))
 				Expect(output.String()).To(ContainSubstring(
 					"policy/%s-openshift-cloud-credential-operator-cloud-creden' to version '%s'",
-					accountRolePrefix, upgradeVersion))
+					accountRolePrefix, roleUpgradeVersion))
 				By("Update cluster with --dry-run")
-
-				output, err = upgradeService.Upgrade(
+				output, _ = upgradeService.Upgrade(
 					"-c", clusterID,
-					"--version", defaultVersion.Version,
+					"--version", upgradingVersion,
 					"--mode", "auto",
-					"--dry-run",
 					"-y",
 				)
-
-				Expect(err).To(BeNil())
-				Expect(output.String()).To(ContainSubstring("should succeed. Please wait 1 to 2 minutes"))
-				time.Sleep(3 * time.Minute)
-
-				By("Upgrade cluster")
-				scheduledDate = time.Now().Format("2006-01-02")
-				scheduledTime = time.Now().Add(10 * time.Minute).UTC().Format("15:04")
-				output, err = upgradeService.Upgrade(
-					"-c", clusterID,
-					"--version", defaultVersion.Version,
-					"--schedule-date", scheduledDate,
-					"--schedule-time", scheduledTime,
-					"-m", "auto",
-					"-y",
-				)
-				Expect(err).To(BeNil())
-				Expect(output.String()).To(ContainSubstring("Upgrade successfully scheduled for cluster"))
+				Expect(output.String()).To(ContainSubstring(
+					"Account roles/policies for cluster '%s' are already up-to-date", clusterID))
+				Expect(output.String()).To(ContainSubstring(
+					"Operator roles/policies associated with the cluster '%s' are already up-to-date", clusterID))
 			})
 	})
 

tests/utils/helper/helper.go

@@ -2,9 +2,12 @@ package helper
 
 import (
 	"crypto/rand"
+	"fmt"
 	"math/big"
 	"os"
 
+	"github.com/Masterminds/semver"
+
 	"github.com/openshift/rosa/tests/utils/constants"
 )
 
@@ -33,3 +36,14 @@ func GetConsoleUrlBasedOnEnv(ocmApi string) string {
 		return ""
 	}
 }
+
+func GetMajorMinorFromVersion(version string) (major int64, minor int64, majorMinorVersion string, err error) {
+	var semverVersion *semver.Version
+	if semverVersion, err = semver.NewVersion(version); err != nil {
+		return
+	}
+	major = semverVersion.Major()
+	minor = semverVersion.Minor()
+	majorMinorVersion = fmt.Sprintf("%d.%d", major, minor)
+	return
+}