OCM-10024 | ci: fix id:75150,73731,73492

openshift · Aug 5, 2024 · 868ddc8 · 868ddc8
1 parent ea34107
commit 868ddc8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 24 deletions.
diff --git a/tests/ci/config/config.go b/tests/ci/config/config.go
@@ -108,6 +108,7 @@ func init() {
 		NamePrefix:            os.Getenv("NAME_PREFIX"),
 		SVPC_CREDENTIALS_FILE: os.Getenv("SHARED_VPC_AWS_SHARED_CREDENTIALS_FILE"),
 		ComputeMachineType:    os.Getenv("COMPUTE_MACHINE_TYPE"),
+		OCM_LOGIN_ENV:         os.Getenv("OCM_LOGIN_ENV"),
 		ClusterWaitingTime:    waitingTime,
 		WaitSetupClusterReady: waitSetupClusterReady,
 	}

diff --git a/tests/e2e/test_rosacli_cluster_post.go b/tests/e2e/test_rosacli_cluster_post.go
@@ -12,7 +12,6 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/openshift-online/ocm-common/pkg/aws/aws_client"
 
-	ciConfig "github.com/openshift/rosa/tests/ci/config"
 	"github.com/openshift/rosa/tests/ci/labels"
 	"github.com/openshift/rosa/tests/utils/common"
 	"github.com/openshift/rosa/tests/utils/common/constants"
@@ -370,14 +369,7 @@ var _ = Describe("Healthy check",
 				By("Check compute machine type")
 				jsonData, err := clusterService.GetJSONClusterDescription(clusterID)
 				Expect(err).To(BeNil())
-				if ciConfig.Test.GlobalENV.ComputeMachineType != "" {
-					Expect(jsonData.DigString("nodes", "compute_machine_type", "id")).To(
-						Equal(ciConfig.Test.GlobalENV.ComputeMachineType))
-				} else if profile.ClusterConfig.InstanceType == "" {
-					Expect(jsonData.DigString("nodes", "compute_machine_type", "id")).To(Equal(constants.DefaultInstanceType))
-				} else {
-					Expect(jsonData.DigString("nodes", "compute_machine_type", "id")).To(Equal(profile.ClusterConfig.InstanceType))
-				}
+				Expect(jsonData.DigString("nodes", "compute_machine_type", "id")).To(Equal(clusterConfig.Nodes.ComputeInstanceType))
 			})
 	})
 

diff --git a/tests/e2e/test_rosacli_node_pool.go b/tests/e2e/test_rosacli_node_pool.go
@@ -16,7 +16,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	ciConfig "github.com/openshift/rosa/tests/ci/config"
 	"github.com/openshift/rosa/tests/ci/labels"
 	"github.com/openshift/rosa/tests/utils/common"
 	"github.com/openshift/rosa/tests/utils/common/constants"
@@ -1007,21 +1006,17 @@ var _ = Describe("Edit nodepool",
 				Expect(err).To(BeNil())
 				rosaClient.Runner.UnsetFormat()
 				organizationID := userInfo.OCMOrganizationID
+				ocmApi := userInfo.OCMApi
 
 				var OCMEnv string
 
 				By("Get OCM Env")
-				if ciConfig.Test.GlobalENV.OCM_LOGIN_ENV != "" {
-					OCM_LOGIN_ENV := ciConfig.Test.GlobalENV.OCM_LOGIN_ENV
-					if strings.Contains(OCM_LOGIN_ENV, "staging") ||
-						strings.Contains(OCM_LOGIN_ENV, "stage") {
-						OCMEnv = "staging"
-					} else if strings.Contains(OCM_LOGIN_ENV, "production") ||
-						strings.Contains(OCM_LOGIN_ENV, "prod") {
-						OCMEnv = "production"
-					}
+				if strings.Contains(ocmApi, "stage") {
+					OCMEnv = "staging"
+				} else if strings.Contains(ocmApi, "integration") {
+					OCMEnv = "integration"
 				} else {
-					OCMEnv = common.ReadENVWithDefaultValue("OCM_LOGIN_ENV", "staging")
+					OCMEnv = "production"
 				}
 
 				By("Get the cluster informations")

diff --git a/tests/e2e/test_rosacli_upgrade.go b/tests/e2e/test_rosacli_upgrade.go
@@ -260,7 +260,7 @@ var _ = Describe("Cluster Upgrade testing",
 				output, err = upgradeService.Upgrade(
 					"-c", clusterID,
 					"--version", upgradingVersion,
-					"--mode", "auto", "--hosted-cp",
+					"--mode", "auto", "--control-plane",
 					"-y",
 				)
 			}

diff --git a/tests/utils/config/cluster.go b/tests/utils/config/cluster.go
@@ -50,9 +50,10 @@ type Subnets struct {
 }
 
 type Nodes struct {
-	Replicas    string `json:"replicas,omitempty"`
-	MinReplicas string `json:"min_replicas,omitempty"`
-	MaxReplicas string `json:"max_replicas,omitempty"`
+	Replicas            string `json:"replicas,omitempty"`
+	MinReplicas         string `json:"min_replicas,omitempty"`
+	MaxReplicas         string `json:"max_replicas,omitempty"`
+	ComputeInstanceType string `json:"compute_instance_type,omitempty"`
 }
 
 type Autoscaling struct {

diff --git a/tests/utils/profilehandler/profile_handler.go b/tests/utils/profilehandler/profile_handler.go
@@ -608,6 +608,7 @@ func GenerateClusterCreateFlags(profile *Profile, client *rosacli.Client) ([]str
 	}
 	if profile.ClusterConfig.InstanceType != "" {
 		flags = append(flags, "--compute-machine-type", profile.ClusterConfig.InstanceType)
+		clusterConfiguration.Nodes.ComputeInstanceType = profile.ClusterConfig.InstanceType
 	}
 	if profile.ClusterConfig.KMSKey {
 		kmsKeyArn, err := PrepareKMSKey(profile.Region, false, "rosacli", profile.ClusterConfig.HCP, false)