From 69272c78082980eb7c53fb92c16cdb4ca03ce2f2 Mon Sep 17 00:00:00 2001 From: Rohith Jayawardene Date: Fri, 25 Aug 2023 11:02:48 +0200 Subject: [PATCH] [E2E] - Diagnostic Bucket (#984) Using the Github run number instead of the run id as it's easier to match the fail to the logs --- test/e2e/check-suite.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/check-suite.sh b/test/e2e/check-suite.sh index af9d7b03c..b1f6150a0 100755 --- a/test/e2e/check-suite.sh +++ b/test/e2e/check-suite.sh @@ -43,15 +43,15 @@ EOF # run_diagnosis is called to retrieve details on the failure run_diagnosis() { - [[ $? -ne 1 ]] && exit $? - [[ "${CI}" != "true" ]] && exit $? + [[ $? -ne 1 ]] && exit 1 + [[ "${CI}" != "true" ]] && exit 1 echo "Running Diagnosis on failure" mkdir -p /tmp/diagnostics if kubectl cluster-info dump --namespaces terraform-system,apps --output-directory=/tmp/diagnostics >/dev/null; then # @step: upload the files to the bucket - BUCKET="${DIAGNOSTICS}/${GITHUB_RUN_ID}" + BUCKET="${DIAGNOSTICS}/${GITHUB_RUN_NUMBER}" if ! aws s3 cp /tmp/diagnostics "${BUCKET}" --acl private --recursive >/dev/null; then echo "Failed to copy all the diagnostics" exit 1