From ae7e621bcfcbd11042d28bbcbee34285890cfcb1 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sat, 13 Mar 2021 09:30:18 -0600 Subject: [PATCH] Upgrade cluster first, then run tests --- tests/e2e/scenarios/upgrade/run-test | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/e2e/scenarios/upgrade/run-test b/tests/e2e/scenarios/upgrade/run-test index 15f6f35cea..f055b4db81 100755 --- a/tests/e2e/scenarios/upgrade/run-test +++ b/tests/e2e/scenarios/upgrade/run-test @@ -47,6 +47,15 @@ kubetest2 kops ${KUBETEST2_COMMON_ARGS} \ --kubernetes-version=v1.18.15 \ --create-args="--networking calico" +kops set cluster ${CLUSTER_NAME} cluster.spec.kubernetesVersion=v1.19.7 +kops update cluster +kops update cluster --admin --yes + +kops rolling-update cluster +kops rolling-update cluster --yes --validation-timeout 30m + +kops validate cluster + KUBECONFIG=${HOME}/.kube/config TEST_ARGS="--kubeconfig=${KUBECONFIG}" if [[ "${CLOUD_PROVIDER}" == "aws" ]]; then @@ -71,12 +80,3 @@ kubetest2 kops ${KUBETEST2_COMMON_ARGS} \ --skip-regex="\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|Dashboard|RuntimeClass|RuntimeHandler|TCP.CLOSE_WAIT|Projected.configMap.optional.updates" \ --test-args="${TEST_ARGS}" - -kops set cluster ${CLUSTER_NAME} cluster.spec.kubernetesVersion=v1.19.7 -kops update cluster -kops update cluster --admin --yes - -kops rolling-update cluster -kops rolling-update cluster --yes --validation-timeout 30m - -kops validate cluster