From 0189da49ce91dbf312d4f8bc6917f96ee2abbe56 Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Tue, 14 Feb 2017 18:29:57 -0800
Subject: [PATCH] Add non-cri configurations for node e2e tests

---
 .../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 +++
 6 files changed, 107 insertions(+)
 create mode 100644 test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
 create mode 100644 test/e2e_node/jenkins/non-cri_validation/image-config.yaml
 create mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties
 create mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties
 create mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties
 create mode 100644 test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties

diff --git a/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml b/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
new file mode 100644
index 00000000000..c53a3c3ebc4
--- /dev/null
+++ b/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
@@ -0,0 +1,58 @@
+---
+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
new file mode 100644
index 00000000000..880dd0888e5
--- /dev/null
+++ b/test/e2e_node/jenkins/non-cri_validation/image-config.yaml
@@ -0,0 +1,14 @@
+images:
+  containervm:
+    image: e2e-node-containervm-v20161208-image # docker 1.11.2
+    project: kubernetes-node-e2e-images
+  gci-family:
+    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
new file mode 100644
index 00000000000..a635e4f197c
--- /dev/null
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..e1133cde1c0
--- /dev/null
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..810e1285647
--- /dev/null
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000000..29b134db883
--- /dev/null
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties
@@ -0,0 +1,8 @@
+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