From 2196be7c7fb96cb51dc98bac9159167ffb3df296 Mon Sep 17 00:00:00 2001 From: Adam Worrall Date: Tue, 11 Jul 2017 14:53:49 -0700 Subject: [PATCH] Leave testing on CVM by default Avoid breaking tests that assume they're testing CVM. --- cluster/gce/config-test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 198ea45cba7..28ed5bcca96 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -63,15 +63,16 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then fi # By default a cluster will be started with the master and nodes -# on Container-optimized OS (cos, previously known as gci). If -# you are updating the os image versions, update this variable. +# on Container-VM, the deprecated OS. Some tests assume container-VM, +# 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: # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml CVM_VERSION=${CVM_VERSION:-container-vm-v20170627} GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} 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} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-}