OCM-14323 | test: fix ids: 75445,64620

Author: yuwang-RH

tests/e2e/test_rosacli_oidc_config.go

@@ -233,12 +233,13 @@ var _ = Describe("Register ummanaged oidc config testing",
 			}
 
 			By("Cleanup created account-roles")
-			_, err := ocmResourceService.DeleteAccountRole("--mode", "auto",
-				"--prefix", accountRolePrefix,
-				"-y")
-			Expect(err).To(BeNil())
+			if accountRolePrefix == "" {
+				_, err := ocmResourceService.DeleteAccountRole("--mode", "auto",
+					"--prefix", accountRolePrefix,
+					"-y")
+				Expect(err).To(BeNil())
+			}
 		})
-
 		It("to register successfully - [id:64620]", labels.High, labels.Runtime.OCMResources, func() {
 			var (
 				secretArn string
@@ -288,14 +289,21 @@ var _ = Describe("Register ummanaged oidc config testing",
 				}
 				if strings.Contains(command, "aws s3api create-bucket") {
 					commandArgs = helper.ParseCommandToArgs(command)
+					// Add '--output json' to the commandArgs
+					jsonOutputArgs := []string{"--output", "json"}
+					commandArgs = append(commandArgs, jsonOutputArgs...)
+
 					stdout, err := rosaClient.Runner.RunCMD(commandArgs)
 					Expect(err).To(BeNil())
 					re := regexp.MustCompile(`"Location":\s*"(http://[^"]+)"`)
 					matches := re.FindStringSubmatch(stdout.String())
 					if len(matches) > 1 {
 						issuerUrl = strings.Replace(matches[1], "http://", "https://", 1)
 					}
-					Expect(issuerUrl).ToNot(BeEmpty(), "issuerUrl is empty which will block coming steps.")
+					Expect(issuerUrl).ToNot(BeEmpty(),
+						"extracted issuerUrl from %s is empty which will block coming steps.",
+						stdout.String(),
+					)
 					continue
 				}
 				_, err := rosaClient.Runner.RunCMD(strings.Split(command, " "))

tests/e2e/test_rosacli_upgrade.go

@@ -499,7 +499,6 @@ var _ = Describe("Cluster Upgrade testing",
 					}
 				}
 			})
-
 		It("to upgrade wide AMI roles with the managed policies in manual mode - [id:75445]",
 			labels.Critical, labels.Runtime.Upgrade, func() {
 				By("Check the cluster version and compare with the profile to decide if skip this case")
@@ -542,7 +541,7 @@ var _ = Describe("Cluster Upgrade testing",
 						"policies. An upgrade isn't needed", resourcesHandler.GetOperatorRolesPrefix()))
 				} else {
 					By("Find STS Classic cluster upgrade version")
-					classicUpgradingVersion, upgradingMajorVersion, err := clusterVersionList.FindUpperYStreamVersion(
+					classicUpgradingVersion, _, err := clusterVersionList.FindUpperYStreamVersion(
 						profile.ChannelGroup, clusterVersion)
 					Expect(err).To(BeNil())
 					if classicUpgradingVersion == "" {
@@ -601,6 +600,8 @@ var _ = Describe("Cluster Upgrade testing",
 					Expect(err).To(BeNil())
 
 					By("Check account role version")
+					expectedPolicyVersion, err := clusterVersionList.FindDefaultUpdatedPolicyVersion()
+					Expect(err).To(BeNil())
 					for _, accArn := range accRoles {
 						fmt.Println("accArn: ", accArn)
 						parse, err := arn.Parse(accArn)
@@ -611,7 +612,7 @@ var _ = Describe("Cluster Upgrade testing",
 						Expect(err).To(BeNil())
 						for _, tag := range accRole.Tags {
 							if *tag.Key == versionTagName {
-								Expect(*tag.Value).To(Equal(upgradingMajorVersion))
+								Expect(*tag.Value).To(Equal(expectedPolicyVersion))
 							}
 						}
 					}
@@ -629,7 +630,7 @@ var _ = Describe("Cluster Upgrade testing",
 						Expect(err).To(BeNil())
 						for _, tag := range policy.Tags {
 							if *tag.Key == versionTagName {
-								Expect(*tag.Value).To(Equal(upgradingMajorVersion))
+								Expect(*tag.Value).To(Equal(expectedPolicyVersion))
 							}
 						}
 					}

tests/utils/exec/rosacli/version_service.go

@@ -469,3 +469,15 @@ func (vl *OpenShiftVersionTableList) FindUpperYStreamVersion(channelGroup string
 		return upgradingVersion, upgradingMajorVersion, nil
 	}
 }
+
+// This function will find the expected version of IAM roles after manual upgrade
+// The version actually is the mayjor version of the latest cluster version
+func (vl *OpenShiftVersionTableList) FindDefaultUpdatedPolicyVersion() (string, error) {
+	sortedVersionList, err := vl.Sort(true)
+	if err != nil {
+		return "", err
+	}
+	latestVersionFromOutput := sortedVersionList.OpenShiftVersions[0].Version
+	latestMajorVersion := helper.SplitMajorVersion(latestVersionFromOutput)
+	return latestMajorVersion, nil
+}