OCM-13543 | test: fix 77159,77829,52419,54469,75534,64187,73814

Author: yuwang-RH

tests/e2e/test_rosacli_account_roles.go

@@ -1010,6 +1010,14 @@ var _ = Describe("Create account roles", labels.Feature.AccountRoles, func() {
 	It("to create/Upgrade account-roles by setting version and channel-group via rosacli - [id:54469]",
 		labels.High, labels.Runtime.OCMResources,
 		func() {
+			var defaultDir string
+			By("Get the default dir")
+			defaultDir = rosaClient.Runner.GetDir()
+			defer func() {
+				By("Go back original by setting runner dir")
+				rosaClient.Runner.SetDir(defaultDir)
+			}()
+
 			By("Prepare y-1 version for testing")
 			versionService := rosaClient.Version
 			// get stable channel version
@@ -1293,6 +1301,7 @@ var _ = Describe("Create account roles for hosted-cp shared vpc", labels.Feature
 				"--path", path,
 				"--route53-role-arn", route53RoleArn,
 				"--vpc-endpoint-role-arn", invalidVpcEndpointRoleArn,
+				"--hosted-cp",
 				"-y")
 			Expect(err).NotTo(BeNil())
 			Expect(output.String()).To(ContainSubstring("Expected a valid policy ARN for vpc-endpoint-role-arn"))
@@ -1307,7 +1316,7 @@ var _ = Describe("Create account roles for hosted-cp shared vpc", labels.Feature
 				"-y")
 			Expect(err).NotTo(BeNil())
 			Expect(output.String()).To(ContainSubstring(
-				"Setting the `route53-role-arn` flag is only supported for hosted clusters"))
+				"Setting the `route53-role-arn` flag is only supported for Hosted Control Plane clusters"))
 
 			By("Validate two share vpc flags are not used together")
 			output, err = ocmResourceService.CreateAccountRole("--mode", "auto",

tests/e2e/test_rosacli_cluster.go

@@ -546,19 +546,11 @@ var _ = Describe("Edit cluster validation should", labels.Feature.Cluster, func(
 				SkipNotHosted()
 			}
 
-			By("Upgrade cluster without --control-plane flag")
-			output, err := upgradeService.Upgrade("-c", clusterID)
-			Expect(err).To(HaveOccurred())
-			textData := rosaClient.Parser.TextData.Input(output).Parse().Tip()
-			Expect(textData).
-				To(ContainSubstring(
-					"ERR: The '--control-plane' option is currently mandatory for Hosted Control Planes"))
-
 			By("Upgrade cluster with invalid cluster id")
 			invalidClusterID := helper.GenerateRandomString(30)
-			output, err = upgradeService.Upgrade("-c", invalidClusterID)
+			output, err := upgradeService.Upgrade("-c", invalidClusterID)
 			Expect(err).To(HaveOccurred())
-			textData = rosaClient.Parser.TextData.Input(output).Parse().Tip()
+			textData := rosaClient.Parser.TextData.Input(output).Parse().Tip()
 			Expect(textData).
 				To(ContainSubstring(
 					"ERR: Failed to get cluster '%s': There is no cluster with identifier or name '%s'",
@@ -568,7 +560,6 @@ var _ = Describe("Edit cluster validation should", labels.Feature.Cluster, func(
 			By("Upgrade cluster with incorrect format of the date and time")
 			output, err = upgradeService.Upgrade(
 				"-c", clusterID,
-				"--control-plane",
 				"--mode=auto",
 				"--schedule-date=\"2024-06\"",
 				"--schedule-time=\"09:00:12\"",
@@ -580,7 +571,6 @@ var _ = Describe("Edit cluster validation should", labels.Feature.Cluster, func(
 			By("Upgrade cluster using --schedule, --schedule-date and --schedule-time flags at the same time")
 			output, err = upgradeService.Upgrade(
 				"-c", clusterID,
-				"--control-plane",
 				"--mode=auto",
 				"--schedule-date=\"2024-06-24\"",
 				"--schedule-time=\"09:00\"",
@@ -595,7 +585,6 @@ var _ = Describe("Edit cluster validation should", labels.Feature.Cluster, func(
 			By("Upgrade cluster using --schedule and --version flags at the same time")
 			output, err = upgradeService.Upgrade(
 				"-c", clusterID,
-				"--control-plane",
 				"--mode=auto",
 				"--schedule=\"5 5 * * *\"",
 				"--version=4.15.10",
@@ -609,7 +598,6 @@ var _ = Describe("Edit cluster validation should", labels.Feature.Cluster, func(
 			By("Upgrade cluster with value not match the cron epression")
 			output, err = upgradeService.Upgrade(
 				"-c", clusterID,
-				"--control-plane",
 				"--mode=auto",
 				"--schedule=\"5 5\"",
 				"-y")
@@ -622,7 +610,6 @@ var _ = Describe("Edit cluster validation should", labels.Feature.Cluster, func(
 			By("Upgrade cluster with node_drain_grace_period")
 			output, err = upgradeService.Upgrade(
 				"-c", clusterID,
-				"--control-plane",
 				"--mode=auto",
 				"--schedule", "20 20 * * *",
 				"--node-drain-grace-period", "60",
@@ -3597,6 +3584,10 @@ var _ = Describe("HCP cluster creation supplemental testing",
 			customProfile.NamePrefix = constants.DefaultNamePrefix
 			clusterHandler, err = handler.NewTempClusterHandler(rosaClient, customProfile)
 			Expect(err).To(BeNil())
+
+			By("Init the cluster id and testing cluster name")
+			clusterID = ""
+			testingClusterName = ""
 		})
 
 		AfterEach(func() {
@@ -3665,52 +3656,54 @@ var _ = Describe("HCP cluster creation supplemental testing",
 			labels.Critical,
 			labels.Runtime.Day1Supplemental,
 			func() {
-				clusterName := helper.GenerateRandomName("ocp-75534", 2)
+				testingClusterName = helper.GenerateRandomName("ocp-75534", 2)
 				flags, err := clusterHandler.GenerateClusterCreateFlags()
 				Expect(err).ToNot(HaveOccurred())
 
 				command := "rosa create cluster --cluster-name " +
-					clusterName + " " + strings.Join(flags, " ") + " " + "--mode auto -y"
+					testingClusterName + " " + strings.Join(flags, " ") + " " + "--mode auto -y"
 				rosalCommand := config.GenerateCommand(command)
-
+				fmt.Println("debug command is: ", rosalCommand.GetFullCommand())
 				stdout, err := rosaClient.Runner.RunCMD(strings.Split(rosalCommand.GetFullCommand(), " "))
+
 				Expect(err).To(BeNil())
-				Expect(stdout.String()).To(ContainSubstring(fmt.Sprintf("Cluster '%s' has been created", clusterName)))
+				Expect(stdout.String()).To(ContainSubstring(fmt.Sprintf("Cluster '%s' has been created", testingClusterName)))
 
 				By("Check the install logs of the hypershift cluster")
 				Eventually(func() (string, error) {
-					output, err := clusterService.InstallLog(clusterName)
+					output, err := clusterService.InstallLog(testingClusterName)
 					return output.String(), err
 				}, time.Minute*10, time.Second*30).Should(And(
-					ContainSubstring("hostedclusters %s Version", clusterName),
-					ContainSubstring("hostedclusters %s Release image is valid", clusterName)))
+					ContainSubstring("hostedclusters %s Version", testingClusterName),
+					ContainSubstring("hostedclusters %s Release image is valid", testingClusterName)))
 
 				By("Check the install logs of the hypershift cluster with flag --watch")
-				output, err := clusterService.InstallLog(clusterName, "--watch")
+				output, err := clusterService.InstallLog(testingClusterName, "--watch")
 				Expect(err).ToNot(HaveOccurred())
-				Expect(output.String()).Should(ContainSubstring("hostedclusters %s Version", clusterName))
-				Expect(output.String()).Should(ContainSubstring("hostedclusters %s Release image is valid", clusterName))
-				Expect(output.String()).Should(ContainSubstring("Cluster '%s' is now ready", clusterName))
+				Expect(output.String()).Should(ContainSubstring("hostedclusters %s Version", testingClusterName))
+				Expect(output.String()).Should(ContainSubstring("hostedclusters %s Release image is valid", testingClusterName))
+				Expect(output.String()).Should(ContainSubstring("Cluster '%s' is now ready", testingClusterName))
 
 				By("Delete the Hypershift cluster")
-				output, err = clusterService.DeleteCluster(clusterName, "-y")
+				output, err = clusterService.DeleteCluster(testingClusterName, "-y")
 				Expect(err).ToNot(HaveOccurred())
-				Expect(output.String()).Should(ContainSubstring("Cluster '%s' will start uninstalling now", clusterName))
+				Expect(output.String()).Should(ContainSubstring("Cluster '%s' will start uninstalling now", testingClusterName))
 
 				By("Check the uninstall logs of the hypershift cluster")
 				Eventually(func() (string, error) {
-					output, err := clusterService.UnInstallLog(clusterName)
+					output, err := clusterService.UnInstallLog(testingClusterName)
 					return output.String(), err
 				}, time.Minute*20, time.Second*30).
 					Should(
-						ContainSubstring("hostedclusters %s Reconciliation completed successfully", clusterName))
+						ContainSubstring("hostedclusters %s Reconciliation completed successfully", testingClusterName))
 
 				By("Check the uninstall log of the hosted cluster with flag --watch")
-				output, err = clusterService.UnInstallLog(clusterName, "--watch")
+				output, err = clusterService.UnInstallLog(testingClusterName, "--watch")
 				Expect(err).ToNot(HaveOccurred())
 				Expect(output.String()).Should(ContainSubstring("hostedclusters %s Reconciliation completed successfully",
-					clusterName))
-				Expect(output.String()).Should(ContainSubstring("Cluster '%s' completed uninstallation", clusterName))
+					testingClusterName))
+				Expect(output.String()).Should(ContainSubstring("Cluster '%s' completed uninstallation", testingClusterName))
+				testingClusterName = ""
 			})
 
 		It("Check single AZ hosted cluster can be created - [id:54413]",

tests/e2e/test_rosacli_network_resources.go

@@ -210,6 +210,11 @@ var _ = Describe("Network Resources",
 				By("Create template dir for template file missing Region Param")
 				templateContent := helper.TemplateWithoutRegionParam()
 				templatePath_1, err := helper.CreateTemplateDirForNetworkResources("without-region", templateContent)
+
+				templateDir := filepath.Dir(templatePath_1)
+				tdpWithoutReion := filepath.Dir(templateDir)
+				tdnWithoutReion := filepath.Base(templateDir)
+				Expect(err).ToNot(HaveOccurred())
 				defer func() {
 					os.Remove(templatePath_1)
 					Eventually(func() (bool, error) {
@@ -243,6 +248,9 @@ var _ = Describe("Network Resources",
 				By("Create template dir for template file missing Name Param")
 				templateContent = helper.TemplateWithoutNameParam()
 				templatePath_2, err := helper.CreateTemplateDirForNetworkResources("without-name", templateContent)
+				templateDir = filepath.Dir(templatePath_2)
+				tdpWithoutName := filepath.Dir(templateDir)
+				tdnWithoutName := filepath.Base(templateDir)
 				defer func() {
 					os.Remove(templatePath_2)
 					Eventually(func() (bool, error) {
@@ -276,6 +284,9 @@ var _ = Describe("Network Resources",
 				By("Create template dir for template file missing VpcCidr value")
 				templateContent = helper.TemplateWithoutCidrValueForVPC()
 				templatePath_3, err := helper.CreateTemplateDirForNetworkResources("without-vpccidr", templateContent)
+				templateDir = filepath.Dir(templatePath_3)
+				tdpWithoutVPCCIDR := filepath.Dir(templateDir)
+				tdnWithoutVPCCIDR := filepath.Base(templateDir)
 				defer func() {
 					os.Remove(templatePath_3)
 					Eventually(func() (bool, error) {
@@ -309,6 +320,9 @@ var _ = Describe("Network Resources",
 				By("Create template dir for template file creating single vpc")
 				templateContent = helper.TemplateForSingleVPC()
 				templatePath_4, err := helper.CreateTemplateDirForNetworkResources("single-vpc", templateContent)
+				templateDir = filepath.Dir(templatePath_4)
+				tdpSingleVPC := filepath.Dir(templateDir)
+				tdnSingleVPC := filepath.Base(templateDir)
 				defer func() {
 					os.Remove(templatePath_4)
 					Eventually(func() (bool, error) {
@@ -340,18 +354,10 @@ var _ = Describe("Network Resources",
 				Expect(err).ToNot(HaveOccurred())
 
 				By("Get current working directory as template dir path")
-				templateDirPath, err := helper.GetCurrentWorkingDir()
-				Expect(err).ToNot(HaveOccurred())
-
 				invalidTemplateDir := "/ss"
 				nonExistentTemplate := "non-existent"
-				invalidTemplateDirErrorMessage := fmt.Sprintf(
-					"ERR: failed to read template file: open %s/ss/cloudformation.yaml: no such file or directory",
-					invalidTemplateDir)
-				nonExistentTemplateErrorMessage := fmt.Sprintf(
-					"ERR: failed to read template file: open "+
-						"cmd/create/network/templates/%s/cloudformation.yaml: no such file or directory",
-					nonExistentTemplate)
+				invalidTemplateDirErrorMessage := "ERR: failed to read template file"
+				nonExistentTemplateErrorMessage := "ERR: failed to read template file"
 				rollBackInProgress := "ROLLBACK_IN_PROGRESS"
 				rollBackRequested := "Rollback requested by user"
 				withoutCidrErrorMessage := "Either CIDR Block or IPv4 IPAM Pool and IPv4 Netmask Length must be provided"
@@ -369,22 +375,25 @@ var _ = Describe("Network Resources",
 					"Error: unknown flag: --invalid": {"--invalid"},
 					"ERR: duplicate tag key Key1": {"--param=Tags=Key1=Value1,Key1=Value2",
 						"--param=Name=duplicate-key"},
-					nonExistentTemplateErrorMessage: {nonExistentTemplate},
-					"Parameters: [Region] do not exist in the template": {"without-region",
-						"--template-dir", templateDirPath, "--param=Name=without-region"},
-					"Parameters: [Name] do not exist in the template": {"without-name",
-						"--template-dir", templateDirPath, "--param=Name=without-name"},
-					withoutCidrErrorMessage: {"without-vpccidr",
-						"--template-dir", templateDirPath, "--param=Name=withoutcidr", "--param=Region=us-west-2"},
+					nonExistentTemplateErrorMessage: {nonExistentTemplate,
+						"--template-dir", invalidTemplateDir, "--param=Name=invalid-dir"},
+					"Parameters: [Region] do not exist in the template": {tdnWithoutReion,
+						"--template-dir", tdpWithoutReion, fmt.Sprintf("--param=Name=%s", tdnWithoutReion)},
+					"Parameters: [Name] do not exist in the template": {tdnWithoutName,
+						"--template-dir", tdpWithoutName, fmt.Sprintf("--param=Name=%s", tdnWithoutName)},
+					withoutCidrErrorMessage: {tdnWithoutVPCCIDR,
+						"--template-dir", tdpWithoutVPCCIDR, fmt.Sprintf(
+							"--param=Name=%s", tdnWithoutVPCCIDR), "--param=Region=us-west-2",
+					},
 					"Parameter 'AvailabilityZoneCount' must be a number not greater than 3": {
 						"--param=AvailabilityZoneCount=10", "--param=Name=invalid-az"},
 					"Parameter 'AvailabilityZoneCount' must be a number not less than 1": {
 						"--param=AvailabilityZoneCount=0", "--param=Name=invalid-az"},
 					"request send failed, Post \"https://cloudformation.ind-west-2.amazonaws.com/\"": {
 						"--param=Region=ind-west-2", "--param=Name=invalid-region"},
 					incorrectStackNameErrorMessage: {"--param=Name=$#aaraj"},
-					incorrectCidrErrorMessage: {"single-vpc",
-						"--template-dir", templateDirPath,
+					incorrectCidrErrorMessage: {tdnSingleVPC,
+						"--template-dir", tdpSingleVPC,
 						"--param=VpcCidr=10.0.", "--param=Name=incorrectcidr", "--param=Region=us-west-2"},
 				}