From bf2fd238cc5bc061ea897f369c3ddf063da0b5ff Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Thu, 27 Oct 2016 14:52:58 -0700
Subject: [PATCH] Add coreos and gci images to the node benchmark job

---
 .../jenkins/benchmark/benchmark-config.yaml   | 42 +++++++++++++++++++
 .../cri_validation/benchmark-config.yaml      | 16 +++----
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
index 50cc0a87cf5..e587895b9cb 100644
--- a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
@@ -48,3 +48,45 @@ images:
     machine: n1-standard-1
     tests:
       - 'resource tracking for 105 pods per node \[Benchmark\]'
+  gci-resource1:
+    image: gci-dev-55-8872-18-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\]'
+  gci-resource2:
+    image: gci-dev-55-8872-18-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\]'
+  gci-resource3:
+    image: gci-dev-55-8872-18-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\]'
+  coreos-resource1:
+    image: coreos-alpha-1122-0-0-v20160727
+    project: coreos-cloud
+    metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
+    machine: n1-standard-1
+    tests:
+      - 'resource tracking for 0 pods per node \[Benchmark\]'
+  coreos-resource2:
+    image: coreos-alpha-1122-0-0-v20160727
+    project: coreos-cloud
+    metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
+    machine: n1-standard-1
+    tests:
+      - 'resource tracking for 35 pods per node \[Benchmark\]'
+  coreos-resource3:
+    image: coreos-alpha-1122-0-0-v20160727
+    project: coreos-cloud
+    metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
+    machine: n1-standard-1
+    tests:
+      - 'resource tracking for 105 pods per node \[Benchmark\]'
diff --git a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
index 73be6410c70..c012cf755bd 100644
--- a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
@@ -1,55 +1,55 @@
 ---
 images:
-  containervm-density1:
+  gci-density1:
     image: gci-dev-55-8872-18-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:
+  gci-density2:
     image: gci-dev-55-8872-18-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:
+  gci-density2-qps60:
     image: gci-dev-55-8872-18-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:
+  gci-density3:
     image: gci-dev-55-8872-18-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:
+  gci-density4:
     image: gci-dev-55-8872-18-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:
+  gci-resource1:
     image: gci-dev-55-8872-18-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:
+  gci-resource2:
     image: gci-dev-55-8872-18-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:
+  gci-resource3:
     image: gci-dev-55-8872-18-0
     project: google-containers
     machine: n1-standard-1