From a7b2514bd18713eef48745145185d22377145bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paolo=20Chil=C3=A0?= Date: Tue, 26 Sep 2023 17:51:21 +0200 Subject: [PATCH] Refactor agent version pinning in integration test script (#3469) * Refactor agent version pinning in integration test script * remove 8.10.2 version pinning --- .buildkite/scripts/steps/integration_tests.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.buildkite/scripts/steps/integration_tests.sh b/.buildkite/scripts/steps/integration_tests.sh index 8e327342c2d..ac6b6956a2c 100755 --- a/.buildkite/scripts/steps/integration_tests.sh +++ b/.buildkite/scripts/steps/integration_tests.sh @@ -3,13 +3,22 @@ set -euxo pipefail source .buildkite/scripts/common.sh +# Override the agent package version using a string with format .. +# NOTE: use only after version bump when the new version is not yet available, for example: +# OVERRIDE_AGENT_PACKAGE_VERSION="8.10.3" +OVERRIDE_AGENT_PACKAGE_VERSION="" + +if [[ -n "$OVERRIDE_AGENT_PACKAGE_VERSION" ]]; then + OVERRIDE_TEST_AGENT_VERSION=${OVERRIDE_AGENT_PACKAGE_VERSION}"-SNAPSHOT" +else + OVERRIDE_TEST_AGENT_VERSION="" +fi # PACKAGE -AGENT_PACKAGE_VERSION=8.10.2 DEV=true EXTERNAL=true SNAPSHOT=true PLATFORMS=linux/amd64,linux/arm64 PACKAGES=tar.gz mage package +AGENT_PACKAGE_VERSION="${OVERRIDE_AGENT_PACKAGE_VERSION}" DEV=true EXTERNAL=true SNAPSHOT=true PLATFORMS=linux/amd64,linux/arm64 PACKAGES=tar.gz mage package # Run integration tests set +e -# Use 8.10.2-SNAPSHOT until the first 8.10.3-SNAPSHOT is produced. -AGENT_VERSION="8.10.2-SNAPSHOT" TEST_INTEG_AUTH_ESS_REGION=azure-eastus2 TEST_INTEG_CLEAN_ON_EXIT=true SNAPSHOT=true mage integration:test +AGENT_VERSION="${OVERRIDE_TEST_AGENT_VERSION}" TEST_INTEG_AUTH_ESS_REGION=azure-eastus2 TEST_INTEG_CLEAN_ON_EXIT=true SNAPSHOT=true mage integration:test TESTS_EXIT_STATUS=$? set -e