From 6aed0cbf61b65b07d93a24a0665b1e706ffaa5e9 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 24 May 2024 10:12:34 +0200 Subject: [PATCH 1/3] add job name and git commit sha value to mld csv artifact --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fa026c4f..ac6569dcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,6 +216,8 @@ stages: stage: test needs: ["build-codec-linux-make"] timeout: "240 minutes" + variables: + MLD_ARTIFACT_NAME: "mld-$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.csv" script: - *print-common-info - *update-scripts-repo @@ -237,7 +239,7 @@ stages: - python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || exit_code=$? - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - - python3 scripts/parse_mld_xml.py report-junit.xml mld.csv + - python3 scripts/parse_mld_xml.py report-junit.xml $MLD_ARTIFACT_NAME - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi - if [ $exit_code -eq 1 ]; then echo "Differences encountered"; exit $EXIT_CODE_NON_BE; fi @@ -253,7 +255,7 @@ stages: paths: - report-junit.xml - report.html - - mld.csv + - $MLD_ARTIFACT_NAME expose_as: "pytest mld results" reports: junit: -- GitLab From 4d0f9bf3a4a4fb11de8a37cb67cb6ac08e69ec6f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 24 May 2024 11:09:29 +0200 Subject: [PATCH 2/3] add another hyphon in artifact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac6569dcd..4c8c637c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,7 +217,7 @@ stages: needs: ["build-codec-linux-make"] timeout: "240 minutes" variables: - MLD_ARTIFACT_NAME: "mld-$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.csv" + MLD_ARTIFACT_NAME: "mld--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.csv" script: - *print-common-info - *update-scripts-repo -- GitLab From 3080f94e68e735948180dc821d38c47bd005a13e Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 24 May 2024 11:13:24 +0200 Subject: [PATCH 3/3] add job id in artifact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c8c637c0..e69d3dd99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,7 +217,7 @@ stages: needs: ["build-codec-linux-make"] timeout: "240 minutes" variables: - MLD_ARTIFACT_NAME: "mld--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.csv" + MLD_ARTIFACT_NAME: "mld--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv" script: - *print-common-info - *update-scripts-repo -- GitLab