From e5efc21de6e257a46f695b985447f3057d79fc71 Mon Sep 17 00:00:00 2001
From: Random-Liu <taotaotheripper@gmail.com>
Date: Thu, 15 Dec 2016 01:33:09 -0800
Subject: [PATCH] Disable AU in node e2e test.

---
 hack/make-rules/test-e2e-node.sh                 |  2 +-
 .../jenkins/benchmark/benchmark-config.yaml      |  6 +++---
 .../jenkins/cri_validation/benchmark-config.yaml | 16 ++++++++--------
 .../jenkins/cri_validation/image-config.yaml     |  2 +-
 .../docker_validation/jenkins-perf.properties    |  2 +-
 .../jenkins-validation.properties                |  2 +-
 test/e2e_node/jenkins/image-config.yaml          |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
index a2d650d3bf..9f783a3407 100755
--- a/hack/make-rules/test-e2e-node.sh
+++ b/hack/make-rules/test-e2e-node.sh
@@ -73,7 +73,7 @@ if [ $remote = true ] ; then
     gci_image=$(gcloud compute images list --project $image_project \
     --no-standard-images --regexp="gci-dev.*" --format="table[no-heading](name)")
     images=$gci_image
-    metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml"
+    metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
   fi
   instance_prefix=${INSTANCE_PREFIX:-"test"}
   cleanup=${CLEANUP:-"true"}
diff --git a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
index f16e84d538..0ab849801f 100644
--- a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
@@ -52,21 +52,21 @@ images:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'resource tracking for 0 pods per node \[Benchmark\]'
   gci-resource2:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'resource tracking for 35 pods per node \[Benchmark\]'
   gci-resource3:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'resource tracking for 105 pods per node \[Benchmark\]'
   coreos-resource1:
diff --git a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
index f96177535c..35a740cc18 100644
--- a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
@@ -4,55 +4,55 @@ images:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'create 35 pods with 0s? interval \[Benchmark\]'
   gci-density2:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'create 105 pods with 0s? interval \[Benchmark\]'
   gci-density2-qps60:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
   gci-density3:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-2
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'create 105 pods with 0s? interval \[Benchmark\]'
   gci-density4:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'create 105 pods with 100ms interval \[Benchmark\]'
   gci-resource1:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'resource tracking for 0 pods per node \[Benchmark\]'
   gci-resource2:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'resource tracking for 35 pods per node \[Benchmark\]'
   gci-resource3:
     image: gci-dev-56-8977-0-0
     project: google-containers
     machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
     tests:
       - 'resource tracking for 105 pods per node \[Benchmark\]'
diff --git a/test/e2e_node/jenkins/cri_validation/image-config.yaml b/test/e2e_node/jenkins/cri_validation/image-config.yaml
index 778417b398..719f367577 100644
--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
@@ -5,4 +5,4 @@ images:
   gci-family:
     image_regex: gci-dev-56-8977-0-0
     project: google-containers
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
diff --git a/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties b/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
index 46d01d3ded..5df9ab59ae 100644
--- a/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
+++ b/test/e2e_node/jenkins/docker_validation/jenkins-perf.properties
@@ -11,7 +11,7 @@ CONFIG_FILE=test/e2e_node/jenkins/docker_validation/perf-config.yaml
 cp $CONFIG_FILE $GCE_IMAGE_CONFIG_PATH
 sed -i -e "s@{{IMAGE}}@${GCI_IMAGE}@g" $GCE_IMAGE_CONFIG_PATH
 sed -i -e "s@{{IMAGE_PROJECT}}@${GCI_IMAGE_PROJECT}@g" $GCE_IMAGE_CONFIG_PATH
-sed -i -e "s@{{METADATA}}@user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION}@g" $GCE_IMAGE_CONFIG_PATH
+sed -i -e "s@{{METADATA}}@user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled@g" $GCE_IMAGE_CONFIG_PATH
 
 GCE_HOSTS=
 GCE_ZONE=us-central1-f
diff --git a/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties b/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
index 34c628d241..6a10423641 100644
--- a/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
+++ b/test/e2e_node/jenkins/docker_validation/jenkins-validation.properties
@@ -11,7 +11,7 @@ GCE_ZONE=us-central1-f
 GCE_PROJECT=k8s-jkns-ci-node-e2e
 # user-data is the GCI cloud init config file.
 # gci-docker-version specifies docker version in GCI image.
-GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION}"
+GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION},gci-update-strategy=update_disabled"
 CLEANUP=true
 GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
 TIMEOUT=1h
diff --git a/test/e2e_node/jenkins/image-config.yaml b/test/e2e_node/jenkins/image-config.yaml
index dcc9f3b4d4..b17b075199 100644
--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -15,4 +15,4 @@ images:
   gci-family:
     image_regex: gci-dev-56-8977-0-0
     project: google-containers
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"