Merge pull request #43883 from yujuhong/rm_non-cri-configs

Automatic merge from submit-queue (batch tested with PRs 43884, 44712, 45124, 43883) Node e2e: Remove CRI/non-CRI configs This depends on https://github.com/kubernetes/test-infra/pull/2363

Merge pull request #43883 from yujuhong/rm_non-cri-configs
4998d78f · Kubernetes Submit Queue · GitHub · d417dc59 · 09cf5c81 · d417dc59
Commit 4998d78f authored May 01, 2017 by Kubernetes Submit Queue Committed by GitHub May 01, 2017
12 changed files
--- a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
---
-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\]'
--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
-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
--- a/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-benchmark.properties
-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
--- a/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
-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'
--- a/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
-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
--- a/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
-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
--- a/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/non-cri_validation/benchmark-config.yaml
---
-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\]'
--- a/test/e2e_node/jenkins/non-cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/non-cri_validation/image-config.yaml
-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
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-benchmark.properties
-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
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-pull.properties
-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'
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-serial.properties
-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
--- a/test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties
+++ b/test/e2e_node/jenkins/non-cri_validation/jenkins-validation.properties
-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