From 1818993a8acfacee3c3a6e0212f184687ac70d20 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Sat, 21 Sep 2024 15:10:59 +0200
Subject: [PATCH] CI: for upgrade testing, checkout old version before
provisioning
Otherwise, modifying the test inventory + it's expected structure will
always fail.
---
tests/scripts/testcases_run.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh
index 7559c4fb2..db689b8c0 100755
--- a/tests/scripts/testcases_run.sh
+++ b/tests/scripts/testcases_run.sh
@@ -15,6 +15,15 @@ else
fi
fi
+# Check out latest tag if testing upgrade
+if [ "${UPGRADE_TEST}" != "false" ]; then
+ git fetch --all && git checkout "$KUBESPRAY_VERSION"
+ # Checkout the CI vars file so it is available
+ git checkout "${CI_COMMIT_SHA}" tests/files/${CI_JOB_NAME}.yml
+ git checkout "${CI_COMMIT_SHA}" ${CI_TEST_REGISTRY_MIRROR}
+ git checkout "${CI_COMMIT_SHA}" ${CI_TEST_SETTING}
+fi
+
# needed for ara not to complain
export TZ=UTC
@@ -41,15 +50,6 @@ if [[ "$CI_JOB_NAME" =~ "opensuse" ]]; then
ansible all -m raw -a 'zypper --gpg-auto-import-keys refresh'
fi
-# Check out latest tag if testing upgrade
-if [ "${UPGRADE_TEST}" != "false" ]; then
- git fetch --all && git checkout "$KUBESPRAY_VERSION"
- # Checkout the CI vars file so it is available
- git checkout "${CI_COMMIT_SHA}" tests/files/${CI_JOB_NAME}.yml
- git checkout "${CI_COMMIT_SHA}" ${CI_TEST_REGISTRY_MIRROR}
- git checkout "${CI_COMMIT_SHA}" ${CI_TEST_SETTING}
-fi
-
run_playbook () {
playbook=$1
shift
--
GitLab