diff --git a/config/jobs/kubernetes/sig-cli/sig-cli-config.yaml b/config/jobs/kubernetes/sig-cli/sig-cli-config.yaml index 9f4cef71b8af..33f278300d0b 100644 --- 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 index fc4b40152486..7d09dbb96f06 100644 --- 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 index c70328f03b38..5073fdde9e4e 100644 --- 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 deleted file mode 100644 index 27d34ae18c5f..000000000000 --- a/jobs/env/ci-kubernetes-e2e-gci-gce-sig-cli.env +++ /dev/null @@ -1,6 +0,0 @@ -### 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 - diff --git a/jobs/env/ci-kubernetes-e2e-gci-gce.env b/jobs/env/ci-kubernetes-e2e-gci-gce.env index 1f236de2d983..3c86fedf2abf 100644 --- 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