Merge pull request #1929 from yingzhanredhat/master

OCM-6309 | ci: Verify test case(s) 63323|64917|64040|61138
openshift · Apr 16, 2024 · dd63b70 · dd63b70
2 parents f79cc7b + adb8019
commit dd63b70
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/tests/e2e/test_rosacli_ingress.go b/tests/e2e/test_rosacli_ingress.go
@@ -42,8 +42,6 @@ var _ = Describe("Edit default ingress",
 
 		It("can update on rosa HCP cluster - [id:63323]",
 			labels.Critical,
-			labels.MigrationToVerify,
-			labels.Exclude,
 			func() {
 				By("Retrieve cluster and get default ingress id")
 				if !isHosted {

diff --git a/tests/e2e/test_rosacli_network_verifier.go b/tests/e2e/test_rosacli_network_verifier.go
@@ -43,8 +43,6 @@ var _ = Describe("Network verifier",
 		//OCP-64917 - [OCM-152] Verify network via the rosa cli
 		It("can verify network - [id:64917]",
 			labels.High,
-			labels.MigrationToVerify,
-			labels.Exclude,
 			func() {
 				By("Get cluster description")
 				output, err := clusterService.DescribeCluster(clusterID)

diff --git a/tests/e2e/test_rosacli_node_pool.go b/tests/e2e/test_rosacli_node_pool.go
@@ -367,8 +367,6 @@ var _ = Describe("Edit nodepool",
 
 		It("does support 'version' parameter on nodepool - [id:61138]",
 			labels.High,
-			labels.MigrationToVerify,
-			labels.Exclude,
 			func() {
 				nodePoolName := common.GenerateRandomName("np-61138", 2)
 

diff --git a/tests/e2e/test_rosacli_verify.go b/tests/e2e/test_rosacli_verify.go
@@ -21,23 +21,20 @@ var _ = Describe("Verify",
 	func() {
 		defer GinkgoRecover()
 		var (
-			clusterID           string
-			rosaClient          *rosacli.Client
-			rosaSensitiveClient *rosacli.Client
-			clusterService      rosacli.ClusterService
-			machinePoolService  rosacli.MachinePoolService
-			clusterConfig       *config.ClusterConfig
+			clusterID          string
+			rosaClient         *rosacli.Client
+			clusterService     rosacli.ClusterService
+			machinePoolService rosacli.MachinePoolService
+			clusterConfig      *config.ClusterConfig
 		)
 
 		BeforeEach(func() {
 			By("Get the cluster")
-			// clusterID = config.GetClusterID()
-			clusterID = config.GetClusterID() // For Jean Chen
+			clusterID = config.GetClusterID()
 			Expect(clusterID).ToNot(Equal(""), "ClusterID is required. Please export CLUSTER_ID")
 
 			By("Init the client")
 			rosaClient = rosacli.NewClient()
-			rosaSensitiveClient = rosacli.NewSensitiveClient()
 			clusterService = rosaClient.Cluster
 			machinePoolService = rosaClient.MachinePool
 			var err error
@@ -131,8 +128,6 @@ var _ = Describe("Verify",
 
 		It("the windows certificates expiration - [id:64040]",
 			labels.Medium,
-			labels.MigrationToVerify,
-			labels.Exclude,
 			func() {
 				//If the case fails,please open a card to ask dev update windows certificates.
 				//Example card: https://issues.redhat.com/browse/SDA-8990
@@ -149,7 +144,7 @@ var _ = Describe("Verify",
 				domains := []string{"api.openshift.com", "sso.redhat.com"}
 				for _, url := range domains {
 					cmd := fmt.Sprintf("openssl s_client -connect %s:443 -showcerts 2>&1  | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p'", url)
-					stdout, err := rosaSensitiveClient.Runner.RunCMD([]string{"bash", "-c", cmd})
+					stdout, err := rosaClient.Runner.RunCMD([]string{"bash", "-c", cmd})
 					Expect(err).ToNot(HaveOccurred())
 					result := strings.Trim(stdout.String(), "\n")
 					ca := strings.Split(result, "-----END CERTIFICATE-----")