From 48cef9585eccb1db5d192d92f71cd51fb5fdbb55 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Mon, 1 Aug 2022 13:59:21 +0300 Subject: [PATCH 1/6] Improve presentation of build artifacts in merge requests. --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef9a466053..3d4b074d7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,8 +135,10 @@ codec-smoke-test: - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi artifacts: + name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME-results" paths: - out/logs + expose_as: 'Smoke test results' # code selftest testvectors with memory-sanitizer binaries @@ -249,12 +251,14 @@ self-test-on-merge-request: exit_codes: - 123 artifacts: + name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME-results" when: always paths: - test_output.txt - scripts/test/logs - scripts/ref/logs - report-junit.xml + expose_as: 'Self test results' reports: junit: report-junit.xml -- GitLab From ddf41f88dd9b42955d809b4538bb9f6e2da6cf29 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Mon, 1 Aug 2022 14:54:02 +0300 Subject: [PATCH 2/6] Adds trailing slash for all output artifact folders to make them work correctly with expose_as. Also adds smoke test summaries into artifacts. --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d4b074d7f..e5d400b08b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,7 +137,9 @@ codec-smoke-test: artifacts: name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME-results" paths: - - out/logs + - out/logs/ + - smoke_test_output.txt + - smoke_test_output_plc.txt expose_as: 'Smoke test results' @@ -255,8 +257,8 @@ self-test-on-merge-request: when: always paths: - test_output.txt - - scripts/test/logs - - scripts/ref/logs + - scripts/test/logs/ + - scripts/ref/logs/ - report-junit.xml expose_as: 'Self test results' reports: -- GitLab From f3658ca20c07af95998a6edfc93dc5e279b42598 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Mon, 1 Aug 2022 15:13:13 +0300 Subject: [PATCH 3/6] Improves name of the artifact download package. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5d400b08b..a2bc3ed0d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,7 +135,7 @@ codec-smoke-test: - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi artifacts: - name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME-results" + name: "mr-$CI_MERGE_REQUEST_IID--sha-CI_COMMIT_SHORT_SHA--stage-CI_JOB_STAGE--results" paths: - out/logs/ - smoke_test_output.txt @@ -253,7 +253,7 @@ self-test-on-merge-request: exit_codes: - 123 artifacts: - name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME-results" + name: "mr-$CI_MERGE_REQUEST_IID--sha-CI_COMMIT_SHORT_SHA--stage-CI_JOB_STAGE--results" when: always paths: - test_output.txt -- GitLab From 345b053a10131b8bf88923a4f5f82a10a4bea849 Mon Sep 17 00:00:00 2001 From: Kacper Sagnowski Date: Mon, 1 Aug 2022 17:10:42 +0200 Subject: [PATCH 4/6] Fix missing variable dereferencing 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 a2bc3ed0d7..30839a93db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,7 +135,7 @@ codec-smoke-test: - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi artifacts: - name: "mr-$CI_MERGE_REQUEST_IID--sha-CI_COMMIT_SHORT_SHA--stage-CI_JOB_STAGE--results" + name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" paths: - out/logs/ - smoke_test_output.txt -- GitLab From 4169d9b2badb0af9887015a6e7e15f599ed87561 Mon Sep 17 00:00:00 2001 From: Kacper Sagnowski Date: Mon, 1 Aug 2022 17:18:38 +0200 Subject: [PATCH 5/6] Fix missing variable dereferencing in another artifact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30839a93db..75aa260b6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,7 +253,7 @@ self-test-on-merge-request: exit_codes: - 123 artifacts: - name: "mr-$CI_MERGE_REQUEST_IID--sha-CI_COMMIT_SHORT_SHA--stage-CI_JOB_STAGE--results" + name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" when: always paths: - test_output.txt -- GitLab From f92d754fb4b4e1c2da1c4ad123b477eebc8aa2ad Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 3 Aug 2022 11:26:59 +0300 Subject: [PATCH 6/6] Adds artifact expose also to main push comparison test. --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e5b775ed2..56420ae02e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -408,12 +408,14 @@ codec-comparison-on-main-push: exit_codes: - 123 artifacts: + name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" when: always paths: - test_output.txt - - scripts/test/logs - - scripts/ref/logs + - scripts/test/logs/ + - scripts/ref/logs/ - report-junit.xml + expose_as: 'Results of comparison to previous merge commit' reports: junit: report-junit.xml -- GitLab