Skip to content

K
k3s
Commit 2196be7c authored by Adam Worrall's avatar Adam Worrall
Browse files
Options

Leave testing on CVM by default

Avoid breaking tests that assume they're testing CVM.
parent 72f58e09
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
cluster/gce/config-test.sh
View file @ 2196be7c
...@@ -63,15 +63,16 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then ...@@ -63,15 +63,16 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then
fi fi
# By default a cluster will be started with the master and nodes # By default a cluster will be started with the master and nodes
# on Container-optimized OS (cos, previously known as gci). If # on Container-VM, the deprecated OS. Some tests assume container-VM,
# you are updating the os image versions, update this variable. # and only when that is fixed can we use Container-Optimized OS
# (cos, gci) as we do in config-default.sh.
# Also please update corresponding image for node e2e at: # Also please update corresponding image for node e2e at:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
CVM_VERSION=${CVM_VERSION:-container-vm-v20170627} CVM_VERSION=${CVM_VERSION:-container-vm-v20170627}
GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0} GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-cos-cloud} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-cos-cloud}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-} GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment