Merge pull request #3592 from Azure/ARO-22851-parametrize-ocp-versions

openshift-merge-bot[bot] · web-flow · commit fde866d869f4 · 2025-12-24T12:21:32.000Z
ARO-22851 parametrize ocp versions
diff --git a/test/e2e-setup/bicep/cluster-nodepool-osdisk.bicep b/test/e2e-setup/bicep/cluster-nodepool-osdisk.bicep
@@ -12,6 +12,12 @@ param identities object
 @description('When true, use the pre-created MSI pool instead of creating identities in the cluster resource group')
 param usePooledIdentities bool = false
 
+@description('ControlPlane OpenShift Version ID')
+param openshiftControlPlaneVersionId string = '4.20'
+
+@description('NodePool OpenShift Version ID')
+param openshiftNodePoolVersionId string = '4.20.5'
+
 @description('Node pool osDisk Size in GiB')
 param nodePoolOsDiskSizeGiB int = 128
 
@@ -46,6 +52,7 @@ module managedIdentities 'modules/managed-identities.bicep' = {
 module AroHcpCluster 'modules/cluster.bicep' = {
   name: 'cluster'
   params: {
+    openshiftVersionId: openshiftControlPlaneVersionId
     clusterName: clusterName
     vnetName: customerInfra.outputs.vnetName
     subnetName: customerInfra.outputs.vnetSubnetName
@@ -60,6 +67,7 @@ module AroHcpCluster 'modules/cluster.bicep' = {
 module AroHcpNodePool 'modules/nodepool.bicep' = {
   name: 'nodepool'
   params: {
+    openshiftVersionId: openshiftNodePoolVersionId
     clusterName: AroHcpCluster.outputs.name
     nodePoolName: nodePoolName
     osDiskSizeGiB: nodePoolOsDiskSizeGiB
diff --git a/test/e2e-setup/bicep/cluster-only.bicep b/test/e2e-setup/bicep/cluster-only.bicep
@@ -12,6 +12,9 @@ param identities object
 @description('When true, use the pre-created MSI pool instead of creating identities in the cluster resource group')
 param usePooledIdentities bool = false
 
+@description('ControlPlane OpenShift Version ID')
+param openshiftControlPlaneVersionId string = '4.20'
+
 module customerInfra 'modules/customer-infra.bicep' = {
   name: 'customerInfra'
   params: {
@@ -37,6 +40,7 @@ module managedIdentities 'modules/managed-identities.bicep' = {
 module AroHcpCluster 'modules/cluster.bicep' = {
   name: 'cluster'
   params: {
+    openshiftVersionId: openshiftControlPlaneVersionId
     clusterName: clusterName
     vnetName: customerInfra.outputs.vnetName
     subnetName: customerInfra.outputs.vnetSubnetName
diff --git a/test/e2e-setup/bicep/demo.bicep b/test/e2e-setup/bicep/demo.bicep
@@ -12,6 +12,12 @@ param identities object
 @description('When true, use the pre-created MSI pool instead of creating identities in the cluster resource group')
 param usePooledIdentities bool = false
 
+@description('ControlPlane OpenShift Version ID')
+param openshiftControlPlaneVersionId string = '4.20'
+
+@description('NodePool OpenShift Version ID')
+param openshiftNodePoolVersionId string = '4.20.5'
+
 module customerInfra 'modules/customer-infra.bicep' = {
   name: 'customerInfra'
   params: {
@@ -37,6 +43,7 @@ module managedIdentities 'modules/managed-identities.bicep' = {
 module AroHcpCluster 'modules/cluster.bicep' = {
   name: 'cluster'
   params: {
+    openshiftVersionId: openshiftControlPlaneVersionId
     clusterName: clusterName
     vnetName: customerInfra.outputs.vnetName
     subnetName: customerInfra.outputs.vnetSubnetName
@@ -51,6 +58,7 @@ module AroHcpCluster 'modules/cluster.bicep' = {
 module AroHcpNodePool 'modules/nodepool.bicep' = {
   name: 'nodepool-1'
   params: {
+    openshiftVersionId: openshiftNodePoolVersionId
     clusterName: AroHcpCluster.outputs.name
     nodePoolName: 'nodepool-1'
   }
diff --git a/test/e2e-setup/bicep/modules/cluster.bicep b/test/e2e-setup/bicep/modules/cluster.bicep
@@ -14,7 +14,7 @@ param vnetName string
 param subnetName string
 
 @description('OpenShift Version ID to use')
-param openshiftVersionId string = '4.19'
+param openshiftVersionId string
 
 @description('Network configuration of the hosted cluster')
 param networkConfig object = {
diff --git a/test/e2e-setup/bicep/modules/nodepool.bicep b/test/e2e-setup/bicep/modules/nodepool.bicep
@@ -8,7 +8,7 @@ param nodePoolName string
 param replicas int = 2
 
 @description('OpenShift Version ID to use')
-param openshiftVersionId string = '4.19.7'
+param openshiftVersionId string
 @description('Size of the osDisk for the node pool in GiB')
 param osDiskSizeGiB int = 64
 
diff --git a/test/e2e-setup/bicep/no-cni.bicep b/test/e2e-setup/bicep/no-cni.bicep
@@ -9,6 +9,9 @@ param clusterName string
 @description('Managed identities to use')
 param identities object
 
+@description('ControlPlane OpenShift Version ID')
+param openshiftControlPlaneVersionId string = '4.20'
+
 module customerInfra 'modules/customer-infra.bicep' = {
   name: 'customerInfra'
   params: {
@@ -33,6 +36,7 @@ module managedIdentities 'modules/managed-identities.bicep' = {
 module AroHcpCluster 'modules/cluster.bicep' = {
   name: 'cluster'
   params: {
+    openshiftVersionId: openshiftControlPlaneVersionId
     clusterName: clusterName
     vnetName: customerInfra.outputs.vnetName
     subnetName: customerInfra.outputs.vnetSubnetName
diff --git a/test/e2e/README.md b/test/e2e/README.md
@@ -66,6 +66,14 @@ export CUSTOMER_SUBSCRIPTION=<subscriptionName>
 export LOCATION=uksouth
 ```
 
+You can also redefine default OpenShift versions the E2E test cases will use
+when deploying ARO HCP hosted cluster, eg.:
+
+```bash
+$ export ARO_HCP_OPENSHIFT_CONTROLPLANE_VERSION=4.20
+$ export ARO_HCP_OPENSHIFT_NODEPOOL_VERSION=4.20.5
+```
+
 So finally, you can run a particular test case:
 
 ```bash
diff --git a/test/e2e/arm64_nodepool.go b/test/e2e/arm64_nodepool.go
@@ -44,8 +44,6 @@ var _ = Describe("Customer", func() {
 				customerVnetSubnetName           = "arm64-vm-subnet1"
 				customerClusterName              = "arm64-vm-hcp-cluster"
 				customerNodePoolName             = "arm64-vm-np-1"
-				openshiftControlPlaneVersionId   = "4.19"
-				openshiftNodeVersionId           = "4.19.7"
 			)
 			// This pattern matches a subset of the smallest (2GiB) ARM64-capable VM sizes listed in https://issues.redhat.com/browse/ARO-22443
 			vmSizePattern := regexp.MustCompile(`^Standard_D(?:2|4)pl(?:d)?s_v6$`)
@@ -66,7 +64,6 @@ var _ = Describe("Customer", func() {
 			clusterParams.ClusterName = customerClusterName
 			managedResourceGroupName := framework.SuffixName(*resourceGroup.Name, "-managed", 64)
 			clusterParams.ManagedResourceGroupName = managedResourceGroupName
-			clusterParams.OpenshiftVersionId = openshiftControlPlaneVersionId
 
 			By("creating customer resources")
 			clusterParams, err = tc.CreateClusterCustomerResources(ctx,
@@ -100,7 +97,6 @@ var _ = Describe("Customer", func() {
 			nodePoolParams := framework.NewDefaultNodePoolParams()
 			nodePoolParams.ClusterName = customerClusterName
 			nodePoolParams.NodePoolName = customerNodePoolName
-			nodePoolParams.OpenshiftVersionId = openshiftNodeVersionId
 			nodePoolParams.Replicas = int32(2)
 			nodePoolParams.VMSize = nodePoolVMSize
 
diff --git a/test/e2e/cluster_authorized_cidrs_connectivity.go b/test/e2e/cluster_authorized_cidrs_connectivity.go
@@ -47,7 +47,6 @@ var _ = Describe("Authorized CIDRs", func() {
 					customerNetworkSecurityGroupName = "customer-nsg-name"
 					customerVnetName                 = "customer-vnet-name"
 					customerVnetSubnetName           = "customer-vnet-subnet1"
-					openshiftControlPlaneVersionId   = "4.19"
 				)
 
 				tc := framework.NewTestContext()
@@ -61,7 +60,6 @@ var _ = Describe("Authorized CIDRs", func() {
 				clusterParams.ClusterName = clusterName
 				managedResourceGroupName := framework.SuffixName(*resourceGroup.Name, "-managed", 64)
 				clusterParams.ManagedResourceGroupName = managedResourceGroupName
-				clusterParams.OpenshiftVersionId = openshiftControlPlaneVersionId
 
 				By("creating customer resources")
 				clusterParams, err = tc.CreateClusterCustomerResources(ctx,
diff --git a/test/e2e/cluster_create_nodepool_osdisk.go b/test/e2e/cluster_create_nodepool_osdisk.go
@@ -44,6 +44,8 @@ var _ = Describe("Customer", func() {
 				customerNodeReplicas      int32 = 2
 			)
 			tc := framework.NewTestContext()
+			openshiftControlPlaneVersionId := framework.DefaultOpenshiftControlPlaneVersionId()
+			openshiftNodeVersionId := framework.DefaultOpenshiftNodePoolVersionId()
 
 			if tc.UsePooledIdentities() {
 				err := tc.AssignIdentityContainers(ctx, 1, 60*time.Second)
@@ -65,13 +67,15 @@ var _ = Describe("Customer", func() {
 				framework.WithScope(framework.BicepDeploymentScopeResourceGroup),
 				framework.WithClusterResourceGroup(*resourceGroup.Name),
 				framework.WithParameters(map[string]interface{}{
-					"persistTagValue":       false,
-					"clusterName":           customerClusterName,
-					"nodePoolName":          customerNodePoolName,
-					"nodePoolOsDiskSizeGiB": customerNodeOsDiskSizeGiB,
-					"nodeReplicas":          customerNodeReplicas,
-					"identities":            identities,
-					"usePooledIdentities":   usePooled,
+					"openshiftControlPlaneVersionId": openshiftControlPlaneVersionId,
+					"openshiftNodePoolVersionId":     openshiftNodeVersionId,
+					"persistTagValue":                false,
+					"clusterName":                    customerClusterName,
+					"nodePoolName":                   customerNodePoolName,
+					"nodePoolOsDiskSizeGiB":          customerNodeOsDiskSizeGiB,
+					"nodeReplicas":                   customerNodeReplicas,
+					"identities":                     identities,
+					"usePooledIdentities":            usePooled,
 				}),
 				framework.WithTimeout(45*time.Minute),
 			)
diff --git a/test/e2e/cluster_list_no_infra.go b/test/e2e/cluster_list_no_infra.go
@@ -40,6 +40,7 @@ var _ = Describe("Customer", func() {
 			const createClustersCount = 2
 
 			tc := framework.NewTestContext()
+			openshiftControlPlaneVersionId := framework.DefaultOpenshiftControlPlaneVersionId()
 
 			if tc.UsePooledIdentities() {
 				err := tc.AssignIdentityContainers(ctx, createClustersCount, 60*time.Second)
@@ -69,10 +70,11 @@ var _ = Describe("Customer", func() {
 					framework.WithScope(framework.BicepDeploymentScopeResourceGroup),
 					framework.WithClusterResourceGroup(*resourceGroup.Name),
 					framework.WithParameters(map[string]any{
-						"clusterName":         clusterName,
-						"persistTagValue":     false,
-						"identities":          identities,
-						"usePooledIdentities": usePooledForCluster,
+						"openshiftControlPlaneVersionId": openshiftControlPlaneVersionId,
+						"clusterName":                    clusterName,
+						"persistTagValue":                false,
+						"identities":                     identities,
+						"usePooledIdentities":            usePooledForCluster,
 					}),
 					framework.WithTimeout(45*time.Minute),
 				)
diff --git a/test/e2e/cluster_tls_endpoints.go b/test/e2e/cluster_tls_endpoints.go
@@ -44,10 +44,10 @@ var _ = Describe("Customer", func() {
 			customerVnetSubnetName           = "customer-vnet-subnet1"
 			customerClusterName              = "tls-endpoint-hcp-cluster"
 			customerNodePoolName             = "np-1"
-			openshiftControlPlaneVersionId   = "4.19"
-			openshiftNodeVersionId           = "4.19.7"
 		)
 		tc := framework.NewTestContext()
+		openshiftControlPlaneVersionId := framework.DefaultOpenshiftControlPlaneVersionId()
+		openshiftNodeVersionId := framework.DefaultOpenshiftNodePoolVersionId()
 
 		if tc.UsePooledIdentities() {
 			err := tc.AssignIdentityContainers(ctx, 1, 60*time.Second)
diff --git a/test/e2e/clusters_sharing_resgroup.go b/test/e2e/clusters_sharing_resgroup.go
@@ -40,7 +40,6 @@ var _ = Describe("Customer", func() {
 				customerVnetName                 = "customer-vnet-name"
 				customerVnetSubnetName           = "customer-vnet-subnet1"
 				customerClusterName              = "basic-hcp-cluster"
-				openshiftControlPlaneVersionId   = "4.19"
 
 				customerNetworkSecurityGroupName2 = "customer-nsg2-name"
 				customerVnetName2                 = "customer-vnet2-name"
@@ -53,6 +52,7 @@ var _ = Describe("Customer", func() {
 				customerClusterName3              = "basic-hcp-cluster3"
 			)
 			tc := framework.NewTestContext()
+			openshiftControlPlaneVersionId := framework.DefaultOpenshiftControlPlaneVersionId()
 
 			if tc.UsePooledIdentities() {
 				err := tc.AssignIdentityContainers(ctx, 3, 60*time.Second)
diff --git a/test/e2e/complete_cluster_create.go b/test/e2e/complete_cluster_create.go
@@ -47,8 +47,6 @@ var _ = Describe("Customer", func() {
 				customerVnetSubnetName           = "customer-vnet-subnet1"
 				customerClusterName              = "basic-hcp-cluster"
 				customerNodePoolName             = "np-1"
-				openshiftControlPlaneVersionId   = "4.19"
-				openshiftNodeVersionId           = "4.19.7"
 			)
 			tc := framework.NewTestContext()
 
@@ -66,7 +64,6 @@ var _ = Describe("Customer", func() {
 			clusterParams.ClusterName = customerClusterName
 			managedResourceGroupName := framework.SuffixName(*resourceGroup.Name, "-managed", 64)
 			clusterParams.ManagedResourceGroupName = managedResourceGroupName
-			clusterParams.OpenshiftVersionId = openshiftControlPlaneVersionId
 
 			By("creating customer resources")
 			clusterParams, err = tc.CreateClusterCustomerResources(ctx,
@@ -110,7 +107,6 @@ var _ = Describe("Customer", func() {
 			nodePoolParams := framework.NewDefaultNodePoolParams()
 			nodePoolParams.ClusterName = customerClusterName
 			nodePoolParams.NodePoolName = customerNodePoolName
-			nodePoolParams.OpenshiftVersionId = openshiftNodeVersionId
 			nodePoolParams.Replicas = int32(2)
 
 			err = tc.CreateNodePoolFromParam(ctx,
diff --git a/test/e2e/external_auth_create.go b/test/e2e/external_auth_create.go
@@ -54,12 +54,12 @@ var _ = Describe("Customer", func() {
 				customerVnetSubnetName           = "ea-vnet-subnet1"
 				customerClusterName              = "ea-cluster"
 				customerNodePoolName             = "ea-np-1"
-				openshiftControlPlaneVersionId   = "4.19"
-				openshiftNodeVersionId           = "4.19.7"
 				customerExternalAuthName         = "external-auth"
 				externalAuthSubjectPrefix        = "prefix-" // TODO: ARO-21008 preventing us setting NoPrefix
 			)
 			tc := framework.NewTestContext()
+			openshiftControlPlaneVersionId := framework.DefaultOpenshiftControlPlaneVersionId()
+			openshiftNodeVersionId := framework.DefaultOpenshiftNodePoolVersionId()
 
 			if tc.UsePooledIdentities() {
 				err := tc.AssignIdentityContainers(ctx, 1, 60*time.Second)
diff --git a/test/e2e/gpu_nodepools_create_delete.go b/test/e2e/gpu_nodepools_create_delete.go
@@ -63,6 +63,8 @@ var _ = Describe("HCP Nodepools GPU instances", func() {
 				customerClusterName := "gpu-nodepool-cluster-" + rand.String(6)
 
 				tc := framework.NewTestContext()
+				openshiftControlPlaneVersionId := framework.DefaultOpenshiftControlPlaneVersionId()
+				openshiftNodeVersionId := framework.DefaultOpenshiftNodePoolVersionId()
 				if tc.UsePooledIdentities() {
 					err := tc.AssignIdentityContainers(ctx, 1, 60*time.Second)
 					Expect(err).NotTo(HaveOccurred())
@@ -84,9 +86,11 @@ var _ = Describe("HCP Nodepools GPU instances", func() {
 					framework.WithScope(framework.BicepDeploymentScopeResourceGroup),
 					framework.WithClusterResourceGroup(*resourceGroup.Name),
 					framework.WithParameters(map[string]interface{}{
-						"clusterName":         customerClusterName,
-						"identities":          identities,
-						"usePooledIdentities": usePooled,
+						"openshiftControlPlaneVersionId": openshiftControlPlaneVersionId,
+						"openshiftNodePoolVersionId":     openshiftNodeVersionId,
+						"clusterName":                    customerClusterName,
+						"identities":                     identities,
+						"usePooledIdentities":            usePooled,
 					}),
 					framework.WithTimeout(45*time.Minute),
 				)
@@ -112,10 +116,11 @@ var _ = Describe("HCP Nodepools GPU instances", func() {
 					framework.WithScope(framework.BicepDeploymentScopeResourceGroup),
 					framework.WithClusterResourceGroup(*resourceGroup.Name),
 					framework.WithParameters(map[string]interface{}{
-						"clusterName":  customerClusterName,
-						"nodePoolName": npName,
-						"replicas":     1,
-						"vmSize":       sku.vmSize,
+						"openshiftVersionId": openshiftNodeVersionId,
+						"clusterName":        customerClusterName,
+						"nodePoolName":       npName,
+						"replicas":           1,
+						"vmSize":             sku.vmSize,
 					}),
 					framework.WithTimeout(45*time.Minute),
 				)
diff --git a/test/e2e/image_registry_cluster_create.go b/test/e2e/image_registry_cluster_create.go
@@ -45,7 +45,6 @@ var _ = Describe("Customer", func() {
 				customerVnetName                 = "customer-vnet-name"
 				customerVnetSubnetName           = "customer-vnet-subnet1"
 				customerClusterName              = "disabled-image-registry-hcp-cluster"
-				openshiftVersionId               = "4.19"
 			)
 			tc := framework.NewTestContext()
 
@@ -63,7 +62,6 @@ var _ = Describe("Customer", func() {
 			clusterParams.ClusterName = customerClusterName
 			managedResourceGroupName := framework.SuffixName(*resourceGroup.Name, "-managed", 64)
 			clusterParams.ManagedResourceGroupName = managedResourceGroupName
-			clusterParams.OpenshiftVersionId = openshiftVersionId
 			clusterParams.ImageRegistryState = string(hcpsdk20240610preview.ClusterImageRegistryProfileStateDisabled)
 
 			By("creating customer resources")
diff --git a/test/util/framework/deployment_params.go b/test/util/framework/deployment_params.go
@@ -19,6 +19,7 @@ import (
 	"embed"
 	"encoding/json"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
@@ -58,9 +59,25 @@ type NetworkConfig struct {
 	HostPrefix  int32
 }
 
+func DefaultOpenshiftControlPlaneVersionId() string {
+	version := os.Getenv("ARO_HCP_OPENSHIFT_CONTROLPLANE_VERSION")
+	if version == "" {
+		return "4.20"
+	}
+	return version
+}
+
+func DefaultOpenshiftNodePoolVersionId() string {
+	version := os.Getenv("ARO_HCP_OPENSHIFT_NODEPOOL_VERSION")
+	if version == "" {
+		return "4.20.5"
+	}
+	return version
+}
+
 func NewDefaultClusterParams() ClusterParams {
 	return ClusterParams{
-		OpenshiftVersionId: "4.19",
+		OpenshiftVersionId: DefaultOpenshiftControlPlaneVersionId(),
 		Network: NetworkConfig{
 			NetworkType: "OVNKubernetes",
 			PodCIDR:     "10.128.0.0/14",
@@ -97,7 +114,7 @@ type NodePoolAutoScalingParams struct {
 
 func NewDefaultNodePoolParams() NodePoolParams {
 	return NodePoolParams{
-		OpenshiftVersionId:     "4.19.7",
+		OpenshiftVersionId:     DefaultOpenshiftNodePoolVersionId(),
 		Replicas:               int32(2),
 		VMSize:                 "Standard_D8s_v3",
 		OSDiskSizeGiB:          int32(64),
