Merge pull request #9672 from spiffxp/rm-etcd2-from-tests

Remove etcd2 from non-upgrade CI tests
kubernetes · Oct 3, 2018 · e0a7f8b · e0a7f8b
2 parents 246f729 + 1656319
commit e0a7f8b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 21 deletions.
diff --git a/config/jobs/kubernetes/sig-cli/sig-cli-config.yaml b/config/jobs/kubernetes/sig-cli/sig-cli-config.yaml
@@ -55,7 +55,6 @@ periodics:
       - --scenario=kubernetes_e2e
       - --
       - --check-leaked-resources
-      - --env-file=jobs/env/ci-kubernetes-e2e-gci-gce-sig-cli.env
       - --extract=ci/latest
       - --gcp-master-image=gci
       - --gcp-node-image=gci

diff --git a/jobs/env/ci-kubernetes-e2e-gce-alpha-api.env b/jobs/env/ci-kubernetes-e2e-gce-alpha-api.env
@@ -1,9 +1,4 @@
 ### job-env
 
-# For now explicitly test etcd v2 mode in this suite.
-STORAGE_BACKEND=etcd2
-TEST_ETCD_IMAGE=2.2.1
-TEST_ETCD_VERSION=2.2.1
-
 # List GCE Alpha features we want to enable, separated by commas.
 GCE_ALPHA_FEATURES=NetworkTiers
diff --git a/jobs/env/ci-kubernetes-e2e-gci-gce-ip-alias.env b/jobs/env/ci-kubernetes-e2e-gci-gce-ip-alias.env
@@ -1,8 +1,3 @@
 ### job-env
 
-# For now explicitly test etcd v2 mode in this suite.
-STORAGE_BACKEND=etcd2
-TEST_ETCD_IMAGE=2.2.1
-TEST_ETCD_VERSION=2.2.1
-
 KUBE_GCE_ENABLE_IP_ALIASES=true
diff --git a/jobs/env/ci-kubernetes-e2e-gci-gce-sig-cli.env b/jobs/env/ci-kubernetes-e2e-gci-gce-sig-cli.env
diff --git a/jobs/env/ci-kubernetes-e2e-gci-gce.env b/jobs/env/ci-kubernetes-e2e-gci-gce.env
@@ -1,8 +1,4 @@
 ### job-env
-# For now explicitly test etcd v2 mode in this suite.
-STORAGE_BACKEND=etcd2
-TEST_ETCD_IMAGE=2.2.1
-TEST_ETCD_VERSION=2.2.1
 
 # Enable the PodSecurityPolicy in tests.
 ENABLE_POD_SECURITY_POLICY=true