Merge pull request #20509 from hakman/kops-cleanup

kOps tests cleanup - 2
kubernetes · Jan 17, 2021 · 86f41aa · 86f41aa
2 parents f5d97fb + d226ef3
commit 86f41aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/config/jobs/kubernetes/kops/kops-periodics-misc.yaml b/config/jobs/kubernetes/kops/kops-periodics-misc.yaml
@@ -24,7 +24,7 @@ periodics:
       - --env=KOPS_RUN_TOO_NEW_VERSION=1
       - --extract=release/stable
       - --ginkgo-parallel
-      - --kops-args=--channel=alpha
+      - --kops-args=--channel=alpha --networking calico
       - --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
       - --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
       - --provider=aws
@@ -61,7 +61,7 @@ periodics:
       - --env=KOPS_RUN_TOO_NEW_VERSION=1
       - --extract=release/stable
       - --ginkgo-parallel=10
-      - --kops-args=--master-count=3
+      - --kops-args=--master-count=3 --networking calico
       - --kops-nodes=6
       - --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
       - --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
@@ -213,6 +213,7 @@ periodics:
       - --env=KOPS_RUN_TOO_NEW_VERSION=1
       - --extract=release/stable
       - --ginkgo-parallel
+      - --kops-args=--networking=calico
       - --kops-feature-flags=-EnableLaunchTemplates
       - --kops-priority-path=/workspace/kubernetes/platforms/linux/amd64
       - --kops-version=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt

diff --git a/config/jobs/kubernetes/kops/kops-presubmits.yaml b/config/jobs/kubernetes/kops/kops-presubmits.yaml
@@ -83,7 +83,7 @@ presubmits:
         - --env=KOPS_DEPLOY_LATEST_URL=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt
         - --env=KOPS_KUBE_RELEASE_URL=https://storage.googleapis.com/kubernetes-release/release
         - --env=KOPS_RUN_TOO_NEW_VERSION=1
-        - --extract=release/latest-1.19
+        - --extract=release/stable-1.20
         - --ginkgo-parallel
         - --kops-build
         - --kops-args=--container-runtime=docker
@@ -167,7 +167,7 @@ presubmits:
         - --env=KOPS_DEPLOY_LATEST_URL=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt
         - --env=KOPS_KUBE_RELEASE_URL=https://storage.googleapis.com/kubernetes-release/release
         - --env=KOPS_RUN_TOO_NEW_VERSION=1
-        - --extract=release/latest-1.19
+        - --extract=release/stable-1.20
         - --ginkgo-parallel
         - --kops-build
         - --kops-args=--container-runtime=containerd --networking=calico