From 1ebfa197dd60a14768eef76103325c014538f3ad Mon Sep 17 00:00:00 2001
From: Minhan Xia <mixia@google.com>
Date: Tue, 21 Feb 2017 11:05:50 -0800
Subject: [PATCH] Bump GCI to gci-stable-56-9000-84-2 on release-1.5

---
 cluster/gce/config-default.sh                    |  2 +-
 cluster/gce/config-test.sh                       |  2 +-
 .../jenkins/benchmark/benchmark-config.yaml      |  6 +++---
 .../jenkins/cri_validation/benchmark-config.yaml | 16 ++++++++--------
 .../jenkins/cri_validation/image-config.yaml     |  2 +-
 test/e2e_node/jenkins/image-config.yaml          |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index 0baeefdb9a90..61df80fc996b 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:-debian
 # 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-v20170214}
-GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
+GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2}
 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 8a3090f24e6a..03edbe47e15e 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:-debian
 # 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-v20170214}
-GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
+GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2}
 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 195355c7f4e6..ff453fcd8ec0 100644
--- a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
@@ -49,21 +49,21 @@ images:
     tests:
       - 'resource tracking for 105 pods per node \[Benchmark\]'
   gci-resource1:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'resource tracking for 0 pods per node \[Benchmark\]'
   gci-resource2:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'resource tracking for 35 pods per node \[Benchmark\]'
   gci-resource3:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
diff --git a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
index f96177535c98..76b49880f649 100644
--- a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
@@ -1,56 +1,56 @@
 ---
 images:
   gci-density1:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'create 35 pods with 0s? interval \[Benchmark\]'
   gci-density2:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'create 105 pods with 0s? interval \[Benchmark\]'
   gci-density2-qps60:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
   gci-density3:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-2
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'create 105 pods with 0s? interval \[Benchmark\]'
   gci-density4:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'create 105 pods with 100ms interval \[Benchmark\]'
   gci-resource1:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'resource tracking for 0 pods per node \[Benchmark\]'
   gci-resource2:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
     tests:
       - 'resource tracking for 35 pods per node \[Benchmark\]'
   gci-resource3:
-    image: gci-dev-56-8977-0-0
+    image: gci-stable-56-9000-84-2
     project: google-containers
     machine: n1-standard-1
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
diff --git a/test/e2e_node/jenkins/cri_validation/image-config.yaml b/test/e2e_node/jenkins/cri_validation/image-config.yaml
index e691e5d4ca67..b3a550a50860 100644
--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
@@ -3,7 +3,7 @@ images:
     image: e2e-node-containervm-v20160604-image
     project: kubernetes-node-e2e-images
   gci-family:
-    image_regex: gci-dev-56-8977-0-0
+    image_regex: gci-stable-56-9000-84-2
     project: google-containers
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
   ubuntu-docker12:
diff --git a/test/e2e_node/jenkins/image-config.yaml b/test/e2e_node/jenkins/image-config.yaml
index 816d6593c98b..58c7a4734b34 100644
--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -16,6 +16,6 @@ images:
     image: e2e-node-containervm-v20160604-image
     project: kubernetes-node-e2e-images
   gci-family:
-    image_regex: gci-dev-56-8977-0-0
+    image_regex: gci-stable-56-9000-84-2
     project: google-containers
     metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"