From b7b95ccb191943a6f10e913d7dff82f6f9bae1e0 Mon Sep 17 00:00:00 2001
From: Random-Liu <taotaotheripper@gmail.com>
Date: Wed, 5 Oct 2016 11:50:24 -0700
Subject: [PATCH] Add serial and benchmark test suite.

---
 .../cri_validation/benchmark-config.yaml      | 58 +++++++++++++++++++
 .../jenkins-benchmark.properties              |  9 +++
 .../cri_validation/jenkins-serial.properties  | 13 +++++
 .../jenkins-validation.properties             | 13 +----
 4 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100644 test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
 create mode 100644 test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
 create mode 100644 test/e2e_node/jenkins/cri_validation/jenkins-serial.properties

diff --git a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
new file mode 100644
index 00000000000..4c13b0e739d
--- /dev/null
+++ b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
@@ -0,0 +1,58 @@
+---
+images:
+  containervm-density1:
+    image: gci-dev-55-8820-0-0
+    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\]'
+  containervm-density2:
+    image: gci-dev-55-8820-0-0
+    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\]'
+  containervm-density2-qps60:
+    image: gci-dev-55-8820-0-0
+    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\]'
+  containervm-density3:
+    image: gci-dev-55-8820-0-0
+    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\]'
+  containervm-density4:
+    image: gci-dev-55-8820-0-0
+    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\]'
+  containervm-resource1:
+    image: gci-dev-55-8820-0-0
+    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\]'
+  containervm-resource2:
+    image: gci-dev-55-8820-0-0
+    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\]'
+  containervm-resource3:
+    image: gci-dev-55-8820-0-0
+    project: google-containers
+    machine: n1-standard-1
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
+    tests:
+      - 'resource tracking for 105 pods per node \[Benchmark\]'
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties b/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
new file mode 100644
index 00000000000..be39c356779
--- /dev/null
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
@@ -0,0 +1,9 @@
+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\]"'
+SETUP_NODE=false
+TEST_ARGS='--runtime-integration-type=cri --feature-gates=DynamicKubeletConfig=true'
+PARALLELISM=1
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties b/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
new file mode 100644
index 00000000000..48c200900a2
--- /dev/null
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
@@ -0,0 +1,13 @@
+GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
+GCE_HOSTS=
+GCE_IMAGES=gci-dev-55-8820-0-0
+GCE_IMAGE_PROJECT=google-containers
+GCE_ZONE=us-central1-f
+GCE_PROJECT=k8s-jkns-ci-node-e2e
+GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT}"
+CLEANUP=true
+GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
+SETUP_NODE=false
+TEST_ARGS='--runtime-integration-type=cri --feature-gates=DynamicKubeletConfig=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
index 89339f3cb81..c71c556a1ad 100644
--- a/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
@@ -1,17 +1,10 @@
-GCI_IMAGE_PROJECT=container-vm-image-staging
-GCI_IMAGE_FAMILY=gci-canary-test
-GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)")
-DOCKER_VERSION=v1.11.2
 GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
-
 GCE_HOSTS=
-GCE_IMAGES=${GCI_IMAGE}
-GCE_IMAGE_PROJECT=${GCI_IMAGE_PROJECT}
+GCE_IMAGES=gci-dev-55-8820-0-0
+GCE_IMAGE_PROJECT=google-containers
 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}"
 CLEANUP=true
 GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
 SETUP_NODE=false