From 6a364fa18c688f299df833a2ce58ee41bb27f38c Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sat, 18 Jun 2022 15:53:12 +0200 Subject: [PATCH] Add support for control plane size, template, and skipping e2e to upgrade scenario --- tests/e2e/scenarios/upgrade-ab/run-test.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/e2e/scenarios/upgrade-ab/run-test.sh b/tests/e2e/scenarios/upgrade-ab/run-test.sh index 2517819e41..5c5eb62157 100755 --- a/tests/e2e/scenarios/upgrade-ab/run-test.sh +++ b/tests/e2e/scenarios/upgrade-ab/run-test.sh @@ -59,10 +59,14 @@ else KOPS="${KOPS_A}" fi + + ${KUBETEST2} \ --up \ --kops-binary-path="${KOPS_A}" \ --kubernetes-version="${K8S_VERSION_A}" \ + --control-plane-size="${KOPS_CONTROL_PLANE_SIZE:-1}" \ + --template-path="${KOPS_TEMPLATE:-}" \ --create-args="--networking calico" # Export kubeconfig-a @@ -107,6 +111,10 @@ cp "${KOPS_B}" "${WORKSPACE}/kops" "${KOPS_B}" export kubecfg --name "${CLUSTER_NAME}" --admin +if [[ -z ${KOPS_SKIP_E2E:-} ]]; then + exit +fi + ${KUBETEST2} \ --cloud-provider="${CLOUD_PROVIDER}" \ --kops-binary-path="${KOPS}" \