Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

test: configurable CONTAINER_RUNTIME via E2E #2753

Merged
merged 1 commit into from
Feb 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/e2e/cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
5 changes: 5 additions & 0 deletions test/e2e/engine/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down Expand Up @@ -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 == "" {
Expand Down
53 changes: 0 additions & 53 deletions test/e2e/test_cluster_configs/flannel/docker.json

This file was deleted.