OCM-13495 | test: fix ids: 57410,57444,75445,75603,75534

Author: yuwang-RH

tests/e2e/test_rosacli_cluster.go

@@ -11,6 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/apimachinery/pkg/util/wait"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 	. "github.com/onsi/ginkgo/v2"
@@ -3499,6 +3501,25 @@ var _ = Describe("Sts cluster creation with external id",
 				})
 				Expect(err).To(BeNil())
 
+				By("Wait for the trust relationship to be updated")
+				err = wait.PollUntilContextTimeout(
+					context.Background(),
+					20*time.Second,
+					300*time.Second,
+					false,
+					func(context.Context) (bool, error) {
+						result, err := awsClient.IamClient.GetRole(context.TODO(), &iam.GetRoleInput{
+							RoleName: aws.String(roleName),
+						})
+
+						if strings.Contains(*result.Role.AssumeRolePolicyDocument, ExternalId) {
+							return true, nil
+						}
+
+						return false, err
+					})
+				Expect(err).To(BeNil())
+
 				By("Create cluster with external id not same with the role setting one")
 				notMatchExternalId := "333B9588-36A5-ECA4-BE8D-7C673B77CDCD"
 				rosalCommand.AddFlags("--external-id", notMatchExternalId)
@@ -3660,7 +3681,7 @@ var _ = Describe("HCP cluster creation supplemental testing",
 				Eventually(func() (string, error) {
 					output, err := clusterService.InstallLog(clusterName)
 					return output.String(), err
-				}, time.Minute*5, time.Second*10).Should(And(
+				}, time.Minute*10, time.Second*30).Should(And(
 					ContainSubstring("hostedclusters %s Version", clusterName),
 					ContainSubstring("hostedclusters %s Release image is valid", clusterName)))
 
@@ -3680,7 +3701,7 @@ var _ = Describe("HCP cluster creation supplemental testing",
 				Eventually(func() (string, error) {
 					output, err := clusterService.UnInstallLog(clusterName)
 					return output.String(), err
-				}, time.Minute*2, time.Second*10).
+				}, time.Minute*20, time.Second*30).
 					Should(
 						ContainSubstring("hostedclusters %s Reconciliation completed successfully", clusterName))
 

tests/e2e/test_rosacli_cluster_post.go

@@ -930,7 +930,19 @@ var _ = Describe("Post-Check testing for cluster creation",
 					By("Check policy is aws managed policy")
 					attachedPolicies, err := awsClient.ListAttachedRolePolicies(operatorRoleName)
 					Expect(err).To(BeNil())
-					Expect(*attachedPolicies[0].PolicyArn).To(ContainSubstring("arn:aws:iam::aws"), operatorRoleName)
+
+					if len(attachedPolicies) > 1 {
+						managedPolicyFound := false
+						for _, policy := range attachedPolicies {
+							if strings.Contains(*policy.PolicyArn, "arn:aws:iam::aws") {
+								managedPolicyFound = true
+								break
+							}
+						}
+						Expect(managedPolicyFound).To(BeTrue())
+					} else {
+						Expect(*attachedPolicies[0].PolicyArn).To(ContainSubstring("arn:aws:iam::aws"), operatorRoleName)
+					}
 				}
 			})
 	})

tests/e2e/test_rosacli_upgrade.go

@@ -60,11 +60,16 @@ var _ = Describe("Cluster Upgrade testing",
 
 		AfterEach(func() {
 			if profile.Version == constants.YStreamPreviousVersion {
-				By("Delete cluster upgrade")
-				output, err := upgradeService.DeleteUpgrade("-c", clusterID, "-y")
+				By("Delete cluster upgrade if there is some scheduled upgrade existed")
+				output, err := upgradeService.DescribeUpgrade(clusterID)
 				Expect(err).ToNot(HaveOccurred())
-				Expect(output.String()).To(ContainSubstring(
-					"Successfully canceled scheduled upgrade on cluster '%s'", clusterID))
+				if !strings.Contains(output.String(), "No scheduled upgrades for cluster") {
+					output, err = upgradeService.DeleteUpgrade("-c", clusterID, "-y")
+					Expect(err).ToNot(HaveOccurred())
+					Expect(output.String()).To(ContainSubstring(
+						"Successfully canceled scheduled upgrade on cluster '%s'", clusterID))
+				}
+
 			}
 
 			By("Clean remaining resources")