OCM-14389 | test: fix ids: 64620,75256,72899

Author: yuwang-RH

tests/e2e/hcp_external_auth_test.go

@@ -148,8 +148,8 @@ var _ = Describe("External auth provider", labels.Feature.ExternalAuthProvider,
 							"revoked",
 							userName,
 						),
-						time.Minute*4,
-						time.Second*10,
+						time.Minute*8,
+						time.Second*20,
 					).Should(BeTrue())
 				}
 			})

tests/e2e/test_rosacli_cluster_post.go

@@ -749,6 +749,15 @@ var _ = Describe("Post-Check testing for cluster deletion",
 		It("to verify the sts cluster is deleted successfully - [id:75256]",
 			labels.High, labels.Runtime.DestroyPost, labels.FedRAMP,
 			func() {
+				clusterID = config.GetClusterID()
+				By("Skip if the cluster is non-sts")
+				isHostedCP, err := clusterService.IsHostedCPCluster(clusterID)
+				Expect(err).To(BeNil())
+				IsSTS, err := clusterService.IsSTSCluster(clusterID)
+				Expect(err).To(BeNil())
+				if !(isHostedCP || IsSTS) {
+					Skip("Skip this case as it doesn't supports on not-sts clusters")
+				}
 				By("Check the operator-roles is deleted")
 				clusterDetail, err := handler.ParseClusterDetail()
 				Expect(err).To(BeNil())
@@ -767,7 +776,6 @@ var _ = Describe("Post-Check testing for cluster deletion",
 				}
 
 				By("Check the cluster is deleted")
-				clusterID = config.GetClusterID()
 				rosaClient.Runner.UnsetArgs()
 				clusterListout, err := clusterService.List()
 				Expect(err).To(BeNil())

tests/e2e/test_rosacli_oidc_config.go

@@ -1,9 +1,9 @@
 package e2e
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
-	"regexp"
 	"strings"
 	"time"
 
@@ -288,31 +288,34 @@ var _ = Describe("Register ummanaged oidc config testing",
 					continue
 				}
 				if strings.Contains(command, "aws s3api create-bucket") {
+					type S3BucketOutPut struct {
+						Location string `json:"Location"`
+					}
+					var s3cmdOutput S3BucketOutPut
 					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*"([^"]+)"`)
-					matches := re.FindStringSubmatch(stdout.String())
-					if len(matches) > 1 {
-						if strings.HasPrefix(matches[1], "http://") || strings.HasPrefix(matches[1], "https://") {
-							issuerUrl = strings.Replace(matches[1], "http://", "https://", 1)
-						} else if strings.HasPrefix(matches[1], "/") {
-							issuerUrl = strings.Replace(matches[1], "/", "https://", 1)
-							region := ""
-							for i, arg := range commandArgs {
-								if arg == "--region" && i+1 < len(commandArgs) {
-									region = commandArgs[i+1]
-									break
-								}
-							}
-							Expect(region).ToNot(BeEmpty(), "extracted region from %s is empty which will block next step", commandArgs)
-							issuerUrl = issuerUrl + ".s3." + region + ".amazonaws.com/"
-						}
+
+					err = json.Unmarshal(stdout.Bytes(), &s3cmdOutput)
+					Expect(err).To(BeNil())
+
+					//Get region from `rosa whoami`
+					whoamiOutput, err := ocmResourceService.Whoami()
+					Expect(err).To(BeNil())
+					rosaClient.Runner.UnsetFormat()
+					whoamiData := ocmResourceService.ReflectAccountsInfo(whoamiOutput)
+					awsRegion := whoamiData.AWSDefaultRegion
+
+					if awsRegion == "us-east-1" {
+						issuerUrl = fmt.Sprintf("https:/%s.s3.amazonaws.com", s3cmdOutput.Location)
+					} else {
+						issuerUrl = strings.Replace(s3cmdOutput.Location, "http://", "https://", 1)
 					}
+
 					Expect(issuerUrl).ToNot(BeEmpty(),
 						"extracted issuerUrl from %s is empty which will block coming steps.",
 						stdout.String(),

tests/utils/helper/oidc.go

@@ -56,15 +56,25 @@ func ExtractOIDCProviderIDFromARN(arn string) string {
 func ExtractCommandsFromOIDCRegister(bf bytes.Buffer) []string {
 	var commands []string
 	commands = strings.Split(bf.String(), "\n\n")
+	// When the rosacli is not the latest version, there will be warning message
+	// This will remove the warning message from the topest command
+	if strings.Contains(commands[0], "WARN") && strings.Contains(commands[0], "aws") {
+		splitCommands := strings.Split(commands[0], "\naws")
+		commands[0] = fmt.Sprintf("aws %s", splitCommands[1])
+	}
 	for k, command := range commands {
 		if strings.Contains(command, "\naws") {
 			splitCommands := strings.Split(command, "\naws")
 			commands[k] = splitCommands[0]
 			commands = append(commands, fmt.Sprintf("aws %s", splitCommands[1]))
 		}
 	}
+
 	var newCommands []string
 	for _, command := range commands {
+		if strings.Contains(command, "WARN") {
+			continue
+		}
 		command = strings.ReplaceAll(command, "\\", "")
 		command = strings.ReplaceAll(command, "\n", " ")
 		spaceRegex := regexp.MustCompile(`\s+`)