From 0a722942ccee1389ac164a85e574ebdd9f84ddb8 Mon Sep 17 00:00:00 2001 From: Maxime Guyot Date: Thu, 14 Feb 2019 14:09:56 +0100 Subject: [PATCH] Use git tag when checking out for test upgrade (#4209) --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1df68ec8c..0b05f0335 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,9 +90,7 @@ before_script: - cd tests && make create-${CI_PLATFORM} -s ; cd - # Check out latest tag if testing upgrade - # Uncomment when gitlab kubespray repo has tags - #- test "${UPGRADE_TEST}" != "false" && git fetch --all && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) - - test "${UPGRADE_TEST}" != "false" && git checkout 9051aa5296ef76fcff69a2e3827cef28752aa475 + - test "${UPGRADE_TEST}" != "false" && git fetch --all && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) # Checkout the CI vars file so it is available - test "${UPGRADE_TEST}" != "false" && git checkout "${CI_BUILD_REF}" tests/files/${CI_JOB_NAME}.yml # Workaround https://github.com/kubernetes-sigs/kubespray/issues/2021