From afbd2ec6fda18e265150365ada0fdaa0a3da98c4 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Tue, 14 Feb 2017 16:36:02 -0800 Subject: [PATCH] Bump GCE ContainerVM to container-vm-v20170214 container-vm-v20170214 is a re-build of the docker-runc in container-vm-v20170201, and should clear the GCE slow tests. c.f. #40828 --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index a369d00b9139..0baeefdb9a90 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -43,7 +43,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian # containervm. If you are updating the containervm version, update this # variable. 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-v20170117} +CVM_VERSION=${CVM_VERSION:-container-vm-v20170214} GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index e31bd455857f..8a3090f24e6a 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -44,7 +44,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian # containervm. If you are updating the containervm version, update this # variable. 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-v20170117} +CVM_VERSION=${CVM_VERSION:-container-vm-v20170214} GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}