From 08cedefde5b08e8efe384c2b22b7c27d21e034d7 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 19 Nov 2024 15:08:49 +0100 Subject: [PATCH 1/3] include new file in basop-ci-branch compat test --- .gitlab-ci.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1328069a6..4a25ec754e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -456,11 +456,17 @@ check-compatibility-with-basop-reference-branch: - cp ivas-basop/IVAS_dec ./IVAS_dec # Not used but needed to launch the pytest - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm - python3 tests/create_short_testvectors.py - - exit_code1=0 - - exit_code2=0 - - python3 -m pytest tests/codec_be_on_mr_nonselection -v --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code1=$? - - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi + + - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test.prm -v --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml || true + - mv report-junit.xml report-junit-selftest-full.xml + - zero_errors=$(cat report-junit-selftest-full.xml | grep -c 'errors="0"') || true + - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test.prm !"; exit $EXIT_CODE_FAIL; fi + + - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_basop_encoder.prm -v --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml || true + - mv report-junit.xml report-junit-selftest-basop-encoder.xml + - zero_errors=$(cat report-junit-selftest-basop-encoder.xml | grep -c 'errors="0"') || true + - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test_basop_encoder.prm !"; exit $EXIT_CODE_FAIL; fi + - exit 0 artifacts: name: "check-float-reference--sha-$CI_COMMIT_SHORT_SHA--results" @@ -473,7 +479,8 @@ check-compatibility-with-basop-reference-branch: expose_as: "check-float-reference results" reports: junit: - - report-junit.xml + - report-junit-selftest-full.xml + - report-junit-sefltest-basop-encoder.xml # --------------------------------------------------------------- # Build jobs -- GitLab From 956395768818328e26f0cf833ae5cca670291bd5 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 19 Nov 2024 17:51:12 +0100 Subject: [PATCH 2/3] fix report names in CI file --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a25ec754e..93951b0498 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -473,14 +473,15 @@ check-compatibility-with-basop-reference-branch: when: always expire_in: 1 month paths: - - report-junit.xml + - report-junit-selftest-full.xml + - report-junit-selftest-basop-encoder.xml - report.html expose_as: "check-float-reference results" reports: junit: - report-junit-selftest-full.xml - - report-junit-sefltest-basop-encoder.xml + - report-junit-selftest-basop-encoder.xml # --------------------------------------------------------------- # Build jobs -- GitLab From 2773b23abb46a895d1d0f1090b2fb91d9801bfec Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 22 Nov 2024 11:47:19 +0100 Subject: [PATCH 3/3] shorten naming and include both html reports --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93951b0498..db080bdead 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -457,13 +457,11 @@ check-compatibility-with-basop-reference-branch: - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm - python3 tests/create_short_testvectors.py - - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test.prm -v --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml || true - - mv report-junit.xml report-junit-selftest-full.xml + - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test.prm -v --update_ref 1 --html=report-selftest-full.html --self-contained-html --junit-xml=report-junit-selftest-full.xml || true - zero_errors=$(cat report-junit-selftest-full.xml | grep -c 'errors="0"') || true - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test.prm !"; exit $EXIT_CODE_FAIL; fi - - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_basop_encoder.prm -v --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml || true - - mv report-junit.xml report-junit-selftest-basop-encoder.xml + - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_basop_encoder.prm -v --update_ref 1 --html=report-selftest-basop-encoder.html --self-contained-html --junit-xml=report-junit-selftest-basop-encoder.xml || true - zero_errors=$(cat report-junit-selftest-basop-encoder.xml | grep -c 'errors="0"') || true - if [ $zero_errors != 1 ]; then echo "Run errors encountered with scripts/config/self_test_basop_encoder.prm !"; exit $EXIT_CODE_FAIL; fi @@ -475,7 +473,8 @@ check-compatibility-with-basop-reference-branch: paths: - report-junit-selftest-full.xml - report-junit-selftest-basop-encoder.xml - - report.html + - report-selftest-full.html + - report-selftest-basop-encoder.html expose_as: "check-float-reference results" reports: -- GitLab