test: configurable CONTAINER_RUNTIME via E2E (#2753)

Azure · Feb 20, 2020 · 09f06bc · 09f06bc
1 parent e547404
commit 09f06bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 53 deletions.
diff --git a/test/e2e/cluster.sh b/test/e2e/cluster.sh
@@ -101,6 +101,7 @@ docker run --rm \
 -e LINUX_NODE_IMAGE_SUBSCRIPTION_ID=$LINUX_NODE_IMAGE_SUBSCRIPTION_ID \
 -e LINUX_NODE_IMAGE_VERSION=$LINUX_NODE_IMAGE_VERSION \
 -e OS_DISK_SIZE_GB=$OS_DISK_SIZE_GB \
+-e CONTAINER_RUNTIME=$CONTAINER_RUNTIME \
 -e LOG_ANALYTICS_WORKSPACE_KEY="${LOG_ANALYTICS_WORKSPACE_KEY}" \
 -e CUSTOM_HYPERKUBE_IMAGE="${CUSTOM_HYPERKUBE_IMAGE}" \
 -e IS_JENKINS="${IS_JENKINS}" \

diff --git a/test/e2e/engine/template.go b/test/e2e/engine/template.go
@@ -48,6 +48,7 @@ type Config struct {
 	LinuxNodeImageSubscriptionID   string `envconfig:"LINUX_NODE_IMAGE_SUBSCRIPTION_ID" default:""`
 	LinuxNodeImageVersion          string `envconfig:"LINUX_NODE_IMAGE_VERSION" default:""`
 	OSDiskSizeGB                   string `envconfig:"OS_DISK_SIZE_GB" default:""`
+	ContainerRuntime               string `envconfig:"CONTAINER_RUNTIME" default:""`
 	OrchestratorRelease            string `envconfig:"ORCHESTRATOR_RELEASE"`
 	OrchestratorVersion            string `envconfig:"ORCHESTRATOR_VERSION"`
 	OutputDirectory                string `envconfig:"OUTPUT_DIR" default:"_output"`
@@ -212,6 +213,10 @@ func Build(cfg *config.Config, masterSubnetID string, agentSubnetIDs []string, i
 		}
 	}
 
+	if config.ContainerRuntime != "" {
+		prop.OrchestratorProfile.KubernetesConfig.ContainerRuntime = config.ContainerRuntime
+	}
+
 	// If the parsed api model input has no expressed version opinion, we check if ENV does have an opinion
 	if prop.OrchestratorProfile.OrchestratorRelease == "" &&
 		prop.OrchestratorProfile.OrchestratorVersion == "" {

diff --git a/test/e2e/test_cluster_configs/flannel/docker.json b/test/e2e/test_cluster_configs/flannel/docker.json