From c722245b4141049fd80222991fd1691d8b718fb4 Mon Sep 17 00:00:00 2001 From: Philippe Martin Date: Thu, 15 Jun 2023 08:57:20 +0200 Subject: [PATCH] Add job number --- .ibm/pipelines/functions.sh | 2 ++ .ibm/pipelines/kubernetes-tests.sh | 2 +- .ibm/tools/tests-results/main.go | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.ibm/pipelines/functions.sh b/.ibm/pipelines/functions.sh index f2ebf45b07d..4f8e68af198 100644 --- a/.ibm/pipelines/functions.sh +++ b/.ibm/pipelines/functions.sh @@ -78,12 +78,14 @@ save_results() { JUNIT="$1" LOGFILE="$2" NAME="$3" + JOB="$4" BASE_URL="https://s3.${IBM_REGION}.cloud-object-storage.appdomain.cloud/${IBM_BUCKET}" GOOGLE_APPLICATION_CREDENTIALS=$PWD/sa.json go run main.go \ --sheetId "${RESULTS_SHEET_ID}" \ --junit "${JUNIT}" \ --pr "${GIT_PR_NUMBER}" \ + --job "${JOB}" \ --test "${NAME}" \ --logfile "${BASE_URL}/${LOGFILE}.txt" ) diff --git a/.ibm/pipelines/kubernetes-tests.sh b/.ibm/pipelines/kubernetes-tests.sh index e0c6345aed9..c3130962e93 100755 --- a/.ibm/pipelines/kubernetes-tests.sh +++ b/.ibm/pipelines/kubernetes-tests.sh @@ -24,5 +24,5 @@ export SKIP_USER_LOGIN_TESTS=true RESULT=${PIPESTATUS[0]} save_logs "${LOGFILE}" "${TEST_NAME}" ${RESULT} -save_results "${PWD}/test-integration.xml" "${LOGFILE}" "${TEST_NAME}" +save_results "${PWD}/test-integration.xml" "${LOGFILE}" "${TEST_NAME}" "${BUILD_NUMBER}" exit ${RESULT} diff --git a/.ibm/tools/tests-results/main.go b/.ibm/tools/tests-results/main.go index 5b377bdbab4..898a71a1eff 100644 --- a/.ibm/tools/tests-results/main.go +++ b/.ibm/tools/tests-results/main.go @@ -28,6 +28,7 @@ func main() { fSheetId = flag.String("sheetId", "", "spreadsheetId") fJunitFile = flag.String("junit", "", "junit file") fPrNumber = flag.String("pr", "", "PR number") + fJobNumber = flag.String("job", "", "Job number") fTestTile = flag.String("test", "", "Test title") fLogFile = flag.String("logfile", "", "Log file including base") ) @@ -49,6 +50,11 @@ func main() { } prNumber := *fPrNumber + if *fJobNumber == "" { + usage("--job is missing") + } + jobNumber := *fJobNumber + if *fTestTile == "" { usage("--test is missing") } @@ -84,6 +90,7 @@ func main() { prNumber, testTitle, logFile, + jobNumber, } err = db.SaveToSheet(ctx, spreadsheetId, data) if err != nil {