OCM-11127 | ci: fix id:73753,67414,55883,75927

openshift · Sep 13, 2024 · 1910f8b · 1910f8b
1 parent a5c17f1
commit 1910f8b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/tests/e2e/test_rosacli_cluster.go b/tests/e2e/test_rosacli_cluster.go
@@ -3530,6 +3530,7 @@ var _ = Describe("Sts cluster creation supplemental testing",
 				testOperatorRolePrefix := common.GenerateRandomName("opp75927", 2)
 				flags, err := profilehandler.GenerateClusterCreateFlags(customProfile, rosaClient)
 				Expect(err).ToNot(HaveOccurred())
+				rolePrefix = flags[16]
 
 				command := "rosa create cluster --cluster-name " + testingClusterName + " " + strings.Join(flags, " ")
 				rosalCommand := config.GenerateCommand(command)

diff --git a/tests/e2e/test_rosacli_kubelet_config.go b/tests/e2e/test_rosacli_kubelet_config.go
@@ -247,6 +247,12 @@ var _ = Describe("Kubeletconfig on HCP cluster",
 		AfterEach(func() {
 			By("Clean the cluster")
 			kubes, err := kubeletService.ListKubeletConfigsAndReflect(clusterID)
+			if !meetThrottleVersion {
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).Should(
+					ContainSubstring("KubeletConfig management is only supported on clusters with OCP '4.14' onwards"))
+				return
+			}
 			Expect(err).NotTo(HaveOccurred())
 			for _, kube := range kubes.KubeletConfigs {
 				kubeletService.DeleteKubeletConfig(clusterID,
@@ -264,6 +270,7 @@ var _ = Describe("Kubeletconfig on HCP cluster",
 					Expect(err).To(HaveOccurred())
 					Expect(out.String()).Should(
 						ContainSubstring("KubeletConfig management is only supported on clusters with OCP '4.14' onwards"))
+					return
 				} else {
 					Expect(err).ToNot(HaveOccurred())
 					Expect(out.String()).
@@ -276,12 +283,6 @@ var _ = Describe("Kubeletconfig on HCP cluster",
 				out, err = kubeletService.CreateKubeletConfig(clusterID,
 					"--pod-pids-limit", "4096",
 				)
-				if !meetThrottleVersion {
-					Expect(err).To(HaveOccurred())
-					Expect(out.String()).Should(
-						ContainSubstring("KubeletConfig management is only supported on clusters with OCP '4.14' onwards"))
-					return
-				}
 
 				Expect(err).To(HaveOccurred())
 				Expect(out.String()).Should(ContainSubstring("Name?"))

diff --git a/tests/e2e/test_rosacli_node_pool.go b/tests/e2e/test_rosacli_node_pool.go
@@ -685,7 +685,7 @@ var _ = Describe("Edit nodepool",
 					lVersion = lowerVersion.Version
 					if lowerVersion.AvailableUpgrades != "" {
 						upgrades := common.ParseCommaSeparatedStrings(lowerVersion.AvailableUpgrades)
-						upgradeVersion = upgrades[len(upgrades)-1]
+						upgradeVersion = upgrades[0]
 						break
 					}
 					Logger.Debugf("The lower version %s has no available upgrades continue to find next one\n", lVersion)
@@ -695,6 +695,7 @@ var _ = Describe("Edit nodepool",
 					return
 				}
 				Logger.Infof("Using previous version %s", lVersion)
+				Logger.Infof("Using upgrade version %s", upgradeVersion)
 
 				By("Prepare a node pool with optional-1 version with manual upgrade")
 				nodePoolManualName := common.GenerateRandomName("np-67414", 2)

diff --git a/tests/e2e/test_rosacli_upgrade.go b/tests/e2e/test_rosacli_upgrade.go
@@ -392,8 +392,6 @@ var _ = Describe("Cluster Upgrade testing",
 			By("Check upgrade state")
 			err = WaitForUpgradeToState(upgradeService, clusterID, con.Scheduled, 4)
 			Expect(err).To(BeNil())
-			err = WaitForUpgradeToState(upgradeService, clusterID, con.Started, 70)
-			Expect(err).To(BeNil())
 		})
 
 		It("to upgrade wide AMI roles with the managed policies in auto mode - [id:57444]",