OCM-13483 | test: fix ids: 61138,70370,67419 and remove 55883

Author: yuwang-RH

tests/e2e/hcp_machine_pool_test.go

@@ -836,7 +836,7 @@ var _ = Describe("HCP Machine Pool", labels.Feature.Machinepool, func() {
 				"")
 			Expect(err).ToNot(HaveOccurred())
 			textData := rosaClient.Parser.TextData.Input(output).Parse().Tip()
-			Expect(textData).To(ContainSubstring("WARN: There is already a pending upgrade"))
+			Expect(textData).To(ContainSubstring("WARN: There is already a"))
 		})
 
 		It("will validate root volume size - [id:66874]",

tests/e2e/test_rosacli_network_verifier.go

@@ -207,7 +207,7 @@ var _ = Describe("Network verifier",
 			})
 
 		It("verify that network will be failed if it can't reach to cluster subnet via the rosa cli - [id:70370]",
-			labels.Medium, labels.Runtime.Day2, labels.Runtime.Destructive,
+			labels.Medium, labels.Runtime.Destructive,
 			func() {
 				By("Prepare a ready byo vpc ROSA cluster")
 				isBYOVPC, err := clusterService.IsBYOVPCCluster(clusterID)
@@ -269,14 +269,38 @@ var _ = Describe("Network verifier",
 				helper.AssertWaitPollNoErr(err, "Network verification result are not ready after 200")
 
 				By("The network verification result will be sync to cluster inflight check")
-				clusterDetail, err = clusterService.DescribeClusterAndReflect(clusterID)
+				err = wait.PollUntilContextTimeout(
+					context.Background(),
+					20*time.Second,
+					300*time.Second,
+					false,
+					func(context.Context) (bool, error) {
+						clusterDetail, err = clusterService.DescribeClusterAndReflect(clusterID)
+						if !strings.Contains(clusterDetail.FailedInflightChecks,
+							fmt.Sprintf("rosa verify network -c %s", clusterID)) {
+							return false, err
+						}
+						return true, err
+					})
 				Expect(err).To(BeNil())
-				Expect(clusterDetail.FailedInflightChecks).To(ContainSubstring(fmt.Sprintf("rosa verify network -c %s", clusterID)))
+
 				for _, s := range strings.Split(subnets, ",") {
 					for _, p := range vpcClient.AllPrivateSubnetIDs() {
 						if s == p {
-							Expect(clusterDetail.FailedInflightChecks).To(ContainSubstring(fmt.Sprintf(
-								"Invalid configurations on subnet '%s' have been identified", s)))
+							err = wait.PollUntilContextTimeout(
+								context.Background(),
+								20*time.Second,
+								300*time.Second,
+								false,
+								func(context.Context) (bool, error) {
+									clusterDetail, err = clusterService.DescribeClusterAndReflect(clusterID)
+									if !strings.Contains(clusterDetail.FailedInflightChecks,
+										fmt.Sprintf("Invalid configurations on subnet '%s' have been identified", s)) {
+										return false, err
+									}
+									return true, err
+								})
+							Expect(err).To(BeNil())
 						}
 					}
 				}

tests/e2e/test_rosacli_node_pool.go

@@ -2,14 +2,12 @@ package e2e
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/utils/strings/slices"
 
 	"github.com/Masterminds/semver"
@@ -498,21 +496,7 @@ var _ = Describe("Edit nodepool",
 				Expect(err).ToNot(HaveOccurred())
 				Expect(np.Version).To(Equal(previousVersion))
 
-				By("Wait for NodePool replicas to be available")
-				err = wait.PollUntilContextTimeout(
-					context.Background(),
-					30*time.Second,
-					20*time.Minute,
-					false,
-					func(context.Context) (bool, error) {
-						npDesc, err := machinePoolService.DescribeAndReflectNodePool(clusterID, nodePoolName)
-						if err != nil {
-							return false, err
-						}
-						return npDesc.CurrentReplicas == defaultNodePoolReplicas, nil
-					})
-				helper.AssertWaitPollNoErr(err, "Replicas are not ready after 600")
-
+				By("Create nodepool with different verions")
 				nodePoolVersion, err := versionList.FindNearestBackwardMinorVersion(clusterVersion, 1, true)
 				Expect(err).ToNot(HaveOccurred())
 				if nodePoolVersion != nil {

tests/e2e/test_rosacli_upgrade.go

@@ -1346,179 +1346,3 @@ var _ = Describe("Create cluster upgrade policy validation", labels.Feature.Clus
 
 		})
 })
-var _ = Describe("Successful Upgrade Testing",
-	labels.Feature.Policy,
-	func() {
-		defer GinkgoRecover()
-
-		var (
-			clusterID      string
-			clusterName    string
-			rosaClient     *rosacli.Client
-			clusterService rosacli.ClusterService
-			upgradeService rosacli.UpgradeService
-			versionService rosacli.VersionService
-			profile        *handler.Profile
-			clusterHandler handler.ClusterHandler
-		)
-
-		BeforeEach(func() {
-			By("Init the client")
-			rosaClient = rosacli.NewClient()
-			clusterService = rosaClient.Cluster
-			upgradeService = rosaClient.Upgrade
-			versionService = rosaClient.Version
-		})
-
-		AfterEach(func() {
-			By("Clean resources")
-			clusterHandler.Destroy()
-		})
-
-		Context("for Y-stream cluster - [id:55883]", labels.Critical, labels.Runtime.Day1Supplemental, func() {
-			It("on STS rosa classic cluster", func() {
-				By("Create a Y-stream sts rosa classic cluster")
-				profile = handler.GetProfile("rosa-upgrade-y-stream", handler.GetYAMLProfilesDir())
-				Expect(profile).ToNot(BeNil())
-				profile.NamePrefix = constants.DefaultNamePrefix
-
-				clusterHandler, err := handler.NewClusterHandlerFromFilesystem(rosaClient, profile)
-				Expect(err).To(BeNil())
-
-				flags, err := clusterHandler.GenerateClusterCreateFlags()
-				Expect(err).ToNot(HaveOccurred())
-
-				clusterName = helper.GenerateRandomName("cluster-55883", 2)
-				command := "rosa create cluster --cluster-name " + clusterName + " " + strings.Join(flags, " ") + " --mode auto"
-				rosalCommand := config.GenerateCommand(command)
-				log.Logger.Info(rosalCommand)
-				output, err := rosaClient.Runner.RunCMD(strings.Split(rosalCommand.GetFullCommand(), " "))
-				Expect(err).ToNot(HaveOccurred())
-				Expect(output.String()).To(ContainSubstring(fmt.Sprintf("Cluster '%s' has been created", clusterName)))
-
-				By("Retrieve cluster ID")
-				rosaClient.Runner.UnsetArgs()
-				clusterListout, err := clusterService.List()
-				Expect(err).To(BeNil())
-				clusterList, err := clusterService.ReflectClusterList(clusterListout)
-				Expect(err).To(BeNil())
-				clusterID = clusterList.ClusterByName(clusterName).ID
-
-				By("Wait for Cluster to be ready")
-				err = clusterService.WaitClusterStatus(clusterID, constants.Ready, 3, 120)
-				Expect(err).To(BeNil(), "It met error or timeout when waiting cluster to ready status")
-
-				By("Check the cluster upgrade version to decide if skip this case")
-				jsonData, err := clusterService.GetJSONClusterDescription(clusterID)
-				Expect(err).To(BeNil())
-				clusterVersion := jsonData.DigString("version", "raw_id")
-
-				clusterVersionList, err := versionService.ListAndReflectVersions(profile.ChannelGroup, false)
-				Expect(err).To(BeNil())
-				upgradingVersion, _, err := clusterVersionList.FindUpperYStreamVersion(profile.ChannelGroup, clusterVersion)
-				Expect(err).To(BeNil())
-				if upgradingVersion == "" {
-					Skip("Skip this case as the cluster is being upgraded.")
-				}
-
-				scheduledDate := time.Now().Format("2006-01-02")
-				scheduledTime := time.Now().Add(10 * time.Minute).UTC().Format("15:04")
-				By("Upgrade STS classic cluster")
-				output, err = upgradeService.Upgrade(
-					"-c", clusterID,
-					"--version", upgradingVersion,
-					"--schedule-date", scheduledDate,
-					"--schedule-time", scheduledTime,
-					"-m", "auto",
-					"-y",
-				)
-				Expect(err).To(BeNil())
-				Expect(output.String()).To(ContainSubstring("Upgrade successfully scheduled for cluster"))
-
-				By("Check upgrade state")
-				err = upgradeService.WaitForUpgradeToState(clusterID, constants.Scheduled, 4)
-				Expect(err).To(BeNil())
-				err = upgradeService.WaitForUpgradeToState(clusterID, constants.Started, 70)
-				Expect(err).To(BeNil())
-
-				By("Check the scheduled upgrade is completed successfully")
-				Eventually(func() (string, error) {
-					output, err := upgradeService.DescribeUpgrade(clusterID)
-					return rosaClient.Parser.TextData.Input(output).Parse().Tip(), err
-				}, time.Minute*70, time.Minute*1).Should(
-					ContainSubstring("INFO: No scheduled upgrades for cluster '%s'", clusterID))
-			})
-
-			It("on rosa hcp cluster", func() {
-				By("Create a Y-stream rosa hcp cluster")
-				profile = handler.GetProfile("rosa-hcp-upgrade-y-stream", handler.GetYAMLProfilesDir())
-				Expect(profile).ToNot(BeNil())
-				profile.NamePrefix = constants.DefaultNamePrefix
-
-				clusterHandler, err := handler.NewClusterHandlerFromFilesystem(rosaClient, profile)
-				Expect(err).To(BeNil())
-
-				flags, err := clusterHandler.GenerateClusterCreateFlags()
-				Expect(err).ToNot(HaveOccurred())
-
-				clusterName = helper.GenerateRandomName("cluster-55883", 2)
-				command := "rosa create cluster --cluster-name " + clusterName + " " + strings.Join(flags, " ")
-				rosalCommand := config.GenerateCommand(command)
-				output, err := rosaClient.Runner.RunCMD(strings.Split(rosalCommand.GetFullCommand(), " "))
-				Expect(err).ToNot(HaveOccurred())
-				Expect(output.String()).To(ContainSubstring(fmt.Sprintf("Cluster '%s' has been created", clusterName)))
-
-				By("Retrieve cluster ID")
-				rosaClient.Runner.UnsetArgs()
-				clusterListout, err := clusterService.List()
-				Expect(err).To(BeNil())
-				clusterList, err := clusterService.ReflectClusterList(clusterListout)
-				Expect(err).To(BeNil())
-				clusterID = clusterList.ClusterByName(clusterName).ID
-
-				By("Wait for Cluster to be ready")
-				err = clusterService.WaitClusterStatus(clusterID, constants.Ready, 3, 60)
-				Expect(err).To(BeNil(), "It met error or timeout when waiting cluster to ready status")
-
-				By("Check the cluster upgrade version to decide if skip this case")
-				jsonData, err := clusterService.GetJSONClusterDescription(clusterID)
-				Expect(err).To(BeNil())
-				clusterVersion := jsonData.DigString("version", "raw_id")
-
-				clusterVersionList, err := versionService.ListAndReflectVersions(profile.ChannelGroup, false)
-				Expect(err).To(BeNil())
-				upgradingVersion, _, err := clusterVersionList.FindUpperYStreamVersion(profile.ChannelGroup, clusterVersion)
-				Expect(err).To(BeNil())
-				if upgradingVersion == "" {
-					Skip("Skip this case as the cluster is being upgraded.")
-				}
-
-				scheduledDate := time.Now().Format("2006-01-02")
-				scheduledTime := time.Now().Add(10 * time.Minute).UTC().Format("15:04")
-				By("Upgrade HCP cluster")
-				output, err = upgradeService.Upgrade(
-					"-c", clusterID,
-					"--version", upgradingVersion,
-					"--schedule-date", scheduledDate,
-					"--schedule-time", scheduledTime,
-					"--control-plane",
-					"-m", "auto",
-					"-y",
-				)
-				Expect(err).To(BeNil())
-				Expect(output.String()).To(ContainSubstring("Upgrade successfully scheduled for cluster"))
-				By("Check upgrade state")
-				err = upgradeService.WaitForUpgradeToState(clusterID, constants.Scheduled, 4)
-				Expect(err).To(BeNil())
-				err = upgradeService.WaitForUpgradeToState(clusterID, constants.Started, 70)
-				Expect(err).To(BeNil())
-
-				By("Check the scheduled upgrade is completed successfully")
-				Eventually(func() (string, error) {
-					output, err := upgradeService.DescribeUpgrade(clusterID)
-					return rosaClient.Parser.TextData.Input(output).Parse().Tip(), err
-				}, time.Minute*30, time.Minute*1).Should(
-					ContainSubstring("INFO: No scheduled upgrades for cluster '%s'", clusterID))
-			})
-		})
-	})