Skip to content

Commit

Permalink
Merge pull request #2280 from aaraj7/master
Browse files Browse the repository at this point in the history
OCM-9865 | test: fix id:75150
  • Loading branch information
openshift-merge-bot[bot] authored Jul 24, 2024
2 parents 2431a23 + 3203bb4 commit 22f38bd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
6 changes: 5 additions & 1 deletion tests/e2e/test_rosacli_cluster_post.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,11 @@ var _ = Describe("Healthy check",
By("Check compute machine type")
jsonData, err := clusterService.GetJSONClusterDescription(clusterID)
Expect(err).To(BeNil())
Expect(jsonData.DigString("nodes", "compute_machine_type", "id")).To(Equal(profile.ClusterConfig.InstanceType))
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))
}
})
})

Expand Down
5 changes: 5 additions & 0 deletions tests/utils/common/constants/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,8 @@ var (
VersionRawPattern = regexp.MustCompile(`[0-9]+\.[0-9]+\.[0-9]+-?[0-9a-z\.-]*`)
VersionFlexyPattern = regexp.MustCompile(`[zy]{1}-[1-3]{1}`)
)

// instance type
const (
DefaultInstanceType = "m5.xlarge"
)

0 comments on commit 22f38bd

Please sign in to comment.