From 09cf5c8192b7b82b972dfa3b9d1d616451cd4fef Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Thu, 16 Mar 2017 16:50:29 -0700
Subject: [PATCH] Node e2e: Remove CRI/non-CRI configs

---
 .../cri_validation/benchmark-config.yaml      | 58 -------------------
 .../jenkins/cri_validation/image-config.yaml  | 14 -----
 .../jenkins-benchmark.properties              |  9 ---
 .../cri_validation/jenkins-pull.properties    |  8 ---
 .../cri_validation/jenkins-serial.properties  | 10 ----
 .../jenkins-validation.properties             |  9 ---
 .../non-cri_validation/benchmark-config.yaml  | 58 -------------------
 .../non-cri_validation/image-config.yaml      | 14 -----
 .../jenkins-benchmark.properties              |  9 ---
 .../jenkins-pull.properties                   |  8 ---
 .../jenkins-serial.properties                 | 10 ----
 .../jenkins-validation.properties             |  8 ---
 12 files changed, 215 deletions(-)
 delete mode 100644 test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
 delete mode 100644 test/e2e_node/jenkins/cri_validation/image-config.yaml
 delete mode 100644 test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
 delete mode 100644 test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
 delete mode 100644 test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
 delete mode 100644 test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
 delete mode 100644 test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
 delete mode 100644 test/e2e_node/jenkins/non-cri_validation/image-config.yaml
 delete mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties
 delete mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties
 delete mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties
 delete mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties

diff --git a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
deleted file mode 100644
index d57cd0b170c..00000000000
--- a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-images:
-  gci-density1:
-    image: gci-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-1
-    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-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-1
-    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-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-1
-    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-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-2
-    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-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-1
-    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-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-1
-    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-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-1
-    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-stable-56-9000-84-2
-    project: google-containers
-    machine: n1-standard-1
-    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
deleted file mode 100644
index e000a31c575..00000000000
--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-images:
-  containervm:
-    image: e2e-node-containervm-v20161208-image # docker 1.11.2
-    project: kubernetes-node-e2e-images
-  gci:
-    image_regex: gci-stable-56-9000-84-2 # docker 1.11.2
-    project: google-containers
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
-  ubuntu-docker12:
-    image: e2e-node-ubuntu-trusty-docker12-v2-image # docker 1.12.6
-    project: kubernetes-node-e2e-images
-  ubuntu-docker10:
-    image: e2e-node-ubuntu-trusty-docker10-v2-image # docker 1.10.3
-    project: kubernetes-node-e2e-images
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties b/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
deleted file mode 100644
index 7752ba79487..00000000000
--- a/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true,StreamingProxyRedirects=true'
-KUBELET_ARGS='--experimental-cri=true'
-PARALLELISM=1
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties b/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
deleted file mode 100644
index 9bdcf664442..00000000000
--- a/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/cri_validation/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-pr-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2'
-TEST_ARGS='--feature-gates=StreamingProxyRedirects=true'
-KUBELET_ARGS='--experimental-cri=true'
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties b/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
deleted file mode 100644
index 2a165e8cd25..00000000000
--- a/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/cri_validation/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true,StreamingProxyRedirects=true'
-KUBELET_ARGS='--experimental-cri=true'
-PARALLELISM=1
-TIMEOUT=3h
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties b/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
deleted file mode 100644
index d413fb962bd..00000000000
--- a/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/cri_validation/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
-TEST_ARGS='--feature-gates=StreamingProxyRedirects=true'
-KUBELET_ARGS='--experimental-cri=true'
-TIMEOUT=1h
diff --git a/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml b/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
deleted file mode 100644
index c53a3c3ebc4..00000000000
--- a/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-images:
-  gci-density1:
-    image: gci-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-1
-    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-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-1
-    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-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-1
-    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-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-2
-    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-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-1
-    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-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-1
-    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-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-1
-    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-beta-56-9000-80-0
-    project: google-containers
-    machine: n1-standard-1
-    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/non-cri_validation/image-config.yaml b/test/e2e_node/jenkins/non-cri_validation/image-config.yaml
deleted file mode 100644
index e53eb1db934..00000000000
--- a/test/e2e_node/jenkins/non-cri_validation/image-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-images:
-  containervm:
-    image: e2e-node-containervm-v20161208-image # docker 1.11.2
-    project: kubernetes-node-e2e-images
-  gci:
-    image_regex: gci-beta-56-9000-80-0 # docker 1.11.2
-    project: google-containers
-    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
-  ubuntu-docker12:
-    image: e2e-node-ubuntu-trusty-docker12-v2-image # docker 1.12.6
-    project: kubernetes-node-e2e-images
-  ubuntu-docker10:
-    image: e2e-node-ubuntu-trusty-docker10-v2-image # docker 1.10.3
-    project: kubernetes-node-e2e-images
diff --git a/test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties b/test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties
deleted file mode 100644
index a635e4f197c..00000000000
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true'
-KUBELET_ARGS='--enable-cri=false'
-PARALLELISM=1
diff --git a/test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties b/test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties
deleted file mode 100644
index e1133cde1c0..00000000000
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/non-cri_validation/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-pr-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2'
-TEST_ARGS='--feature-gates=StreamingProxyRedirects=true'
-KUBELET_ARGS='--enable-cri=false'
diff --git a/test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties b/test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties
deleted file mode 100644
index 810e1285647..00000000000
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/non-cri_validation/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
-TEST_ARGS='--feature-gates=DynamicKubeletConfig=true'
-KUBELET_ARGS='--enable-cri=false'
-PARALLELISM=1
-TIMEOUT=3h
diff --git a/test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties b/test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties
deleted file mode 100644
index 29b134db883..00000000000
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-GCE_HOSTS=
-GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/non-cri_validation/image-config.yaml
-GCE_ZONE=us-central1-f
-GCE_PROJECT=k8s-jkns-ci-node-e2e
-CLEANUP=true
-GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
-KUBELET_ARGS='--enable-cri=false'
-TIMEOUT=1h