From a38c61395ebe4af965a9cc8d1e27833762d2e947 Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Fri, 11 Nov 2016 15:31:49 -0800 Subject: [PATCH] Bump GCI version to gci-dev-56-8977-0-0 --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- .../jenkins/benchmark/benchmark-config.yaml | 8 ++++---- .../jenkins/cri_validation/benchmark-config.yaml | 16 ++++++++-------- test/e2e_node/jenkins/image-config.yaml | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 6a2d74b7e84..d445e05c463 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -44,7 +44,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} # 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=container-vm-v20161025 -GCI_VERSION="gci-dev-56-8938-0-0" +GCI_VERSION="gci-dev-56-8977-0-0" MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 7920cca653b..2835c6853d7 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -45,7 +45,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} # 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=container-vm-v20161025 -GCI_VERSION="gci-dev-56-8938-0-0" +GCI_VERSION="gci-dev-56-8977-0-0" MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} diff --git a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml index e587895b9cb..195355c7f4e 100644 --- a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml +++ b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml @@ -5,7 +5,7 @@ images: project: kubernetes-node-e2e-images machine: n1-standard-1 tests: - - 'create 35 pods with 0s? interval \[Benchmark\]' + - 'create 35 pods with 0s? interval \[Benchmark\]' containervm-density2: image: e2e-node-containervm-v20160604-image project: kubernetes-node-e2e-images @@ -49,21 +49,21 @@ images: tests: - 'resource tracking for 105 pods per node \[Benchmark\]' gci-resource1: - image: gci-dev-55-8872-18-0 + image: gci-dev-56-8977-0-0 project: google-containers machine: n1-standard-1 metadata: "user-data