Add env variables for infrastructure provider and contract

Author: simcod

Makefile

@@ -139,6 +139,8 @@ E2E_FIREWALL_SIZE ?= "v1-small-x86"
 E2E_FIREWALL_NETWORKS ?= "internet-mini-lab"
 ARTIFACTS ?= "$(PWD)/_artifacts"
 E2E_DEFAULT_FLAVOR ?= "calico"
+E2E_INFRASTRUCTURE_PROVIDER ?= "metal-stack"
+E2E_INFRASTRUCTURE_PROVIDER_CONTRACT ?= "v1beta2"
 # Can be something like: basic && !move
 E2E_LABEL_FILTER ?= ""
 
@@ -168,6 +170,8 @@ test-e2e: manifests generate fmt vet build ginkgo kustomize
 	FIREWALL_NETWORKS=$(E2E_FIREWALL_NETWORKS) \
 	ARTIFACTS=$(ARTIFACTS) \
 	E2E_DEFAULT_FLAVOR=$(E2E_DEFAULT_FLAVOR) \
+	INFRASTRUCTURE_PROVIDER=$(E2E_INFRASTRUCTURE_PROVIDER) \
+	INFRASTRUCTURE_PROVIDER_CONTRACT=$(E2E_INFRASTRUCTURE_PROVIDER_CONTRACT) \
 	KUBETEST_CONFIGURATION="$(shell git rev-parse --show-toplevel)/test/e2e/frmwrk/data/kubetest/conformance.yaml" \
 	$(GINKGO) -vv -r --junit-report="junit.e2e_suite.xml" --output-dir="$(ARTIFACTS)" --label-filter="$(E2E_LABEL_FILTER)" -timeout 120m ./test/e2e/frmwrk
 

test/e2e/frmwrk/shared_context.go

@@ -106,6 +106,8 @@ func withDefaultEnvironment() Option {
 		e2e.Environment.controlPlaneMachineImagePrefix = e2e.envOrVar("E2E_CONTROL_PLANE_MACHINE_IMAGE_PREFIX")
 		e2e.Environment.workerMachineImagePrefix = e2e.envOrVar("E2E_WORKER_MACHINE_IMAGE_PREFIX")
 		e2e.Environment.Flavor = e2e.envOrVar("E2E_DEFAULT_FLAVOR")
+		e2e.Environment.infrastructureProvider = e2e.envOrVar("INFRASTRUCTURE_PROVIDER")
+		e2e.Environment.infrastructureProviderContract = e2e.envOrVar("INFRASTRUCTURE_PROVIDER_CONTRACT")
 
 		_ = e2e.envOrVar("CONTROL_PLANE_MACHINE_SIZE")
 		_ = e2e.envOrVar("WORKER_MACHINE_SIZE")
@@ -138,6 +140,8 @@ type Environment struct {
 	publicNetwork                  string
 	kubeconfigPath                 string
 	artifactsPath                  string
+	infrastructureProvider         string
+	infrastructureProviderContract string
 }
 
 func (ee *E2EContext) ProvideBootstrapCluster() {
@@ -209,7 +213,7 @@ func (ee *E2EContext) InitManagementCluster(ctx context.Context) {
 		ClusterProxy:             ee.Environment.Bootstrap,
 		ClusterctlConfigPath:     ee.Environment.ClusterctlConfigPath,
 		LogFolder:                path.Join(ee.Environment.artifactsPath, "clusters", "bootstrap"),
-		InfrastructureProviders:  ee.E2EConfig.GetProviderLatestVersionsByContract("v1beta2", "metal-stack"),
+		InfrastructureProviders:  ee.E2EConfig.GetProviderLatestVersionsByContract(ee.Environment.infrastructureProviderContract, ee.Environment.infrastructureProvider),
 		AddonProviders:           ee.E2EConfig.GetProviderLatestVersionsByContract("v1beta2", clusterctlconfig.HelmAddonProviderName),
 		BootstrapProviders:       ee.E2EConfig.GetProviderLatestVersionsByContract("v1beta2", clusterctlconfig.KubeadmBootstrapProviderName),
 		ControlPlaneProviders:    ee.E2EConfig.GetProviderLatestVersionsByContract("v1beta2", clusterctlconfig.KubeadmControlPlaneProviderName),