From 21ef9ef19fe6dc99e30a09b84e91b341e38e9f08 Mon Sep 17 00:00:00 2001 From: kaanyalti Date: Wed, 18 Dec 2024 23:12:54 -0500 Subject: [PATCH] enhancement(5832): reverted integration_tests.sh changes --- .buildkite/scripts/steps/integration_tests.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.buildkite/scripts/steps/integration_tests.sh b/.buildkite/scripts/steps/integration_tests.sh index 14be77a903f..834da1cd4c6 100755 --- a/.buildkite/scripts/steps/integration_tests.sh +++ b/.buildkite/scripts/steps/integration_tests.sh @@ -7,18 +7,19 @@ STACK_PROVISIONER="${1:-"stateful"}" MAGE_TARGET="${2:-"integration:test"}" MAGE_SUBTARGET="${3:-""}" + # Override the stack version from `.package-version` contents # There is a time when the current snapshot is not available on cloud yet, so we cannot use the latest version automatically # This file is managed by an automation (mage integration:UpdateAgentPackageVersion) that check if the snapshot is ready. STACK_VERSION="$(cat .package-version)" if [[ -n "$STACK_VERSION" ]]; then - STACK_VERSION=${STACK_VERSION}"-SNAPSHOT" + STACK_VERSION=${STACK_VERSION}"-SNAPSHOT" fi # Run integration tests set +e -AGENT_STACK_VERSION="${STACK_VERSION}" TEST_INTEG_CLEAN_ON_EXIT=true STACK_PROVISIONER="$STACK_PROVISIONER" SNAPSHOT=true mage $MAGE_TARGET $MAGE_SUBTARGET +AGENT_STACK_VERSION="${STACK_VERSION}" TEST_INTEG_CLEAN_ON_EXIT=true STACK_PROVISIONER="$STACK_PROVISIONER" SNAPSHOT=true mage $MAGE_TARGET $MAGE_SUBTARGET TESTS_EXIT_STATUS=$? set -e @@ -26,10 +27,10 @@ set -e outputXML="build/TEST-go-integration.xml" if [ -f "$outputXML" ]; then - go install github.com/alexec/junit2html@latest - junit2html <"$outputXML" >build/TEST-report.html + go install github.com/alexec/junit2html@latest + junit2html < "$outputXML" > build/TEST-report.html else - echo "Cannot generate HTML test report: $outputXML not found" + echo "Cannot generate HTML test report: $outputXML not found" fi exit $TESTS_EXIT_STATUS