From 6a695952d98101fec070611ec48ab4a808939082 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 18 Nov 2025 10:21:28 +0100 Subject: [PATCH 1/3] remove testcase removal scripts --- main-basop.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/main-basop.yml b/main-basop.yml index 075f6fd..66607d2 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -285,7 +285,6 @@ workflow: - FLOAT_REF_COMMIT=$(cat "$FLOAT_REF_COMMIT_FILE") - echo "FLOAT_REF_COMMIT=$FLOAT_REF_COMMIT" - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - if [ $LEVEL_SCALING != "1.0" ]; then - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh - fi @@ -442,8 +441,6 @@ workflow: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh dut - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref-merge-source - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - - exit_code_target=0 - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$? @@ -584,8 +581,6 @@ workflow: - enc_dmx_arg="--compare_enc_dmx" - fi - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - ### ----- run pytest for branch (dut) first ----- # create float reference outputs with corresponding branch - python3 -m pytest $TEST_SUITE -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $MERGE_SOURCE_FLOAT_REF_ENCODER_PATH --ref_decoder_path $MERGE_SOURCE_FLOAT_REF_DECODER_PATH || exit_code=$? @@ -688,7 +683,6 @@ workflow: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - set -euxo pipefail - make_args="CLANG=$CLANG_NUM" @@ -738,7 +732,6 @@ workflow: - testcase_timeout=$TESTCASE_TIMEOUT_STV - fi - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - if [ $LEVEL_SCALING != "1.0" ];then - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh - fi @@ -1343,7 +1336,6 @@ ivas-pytest-on-merge-request: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/merge-request-print-pinned-commits.sh # some helper variables - "|| true" to prevent failures from grep not finding anything @@ -1482,7 +1474,6 @@ codec-smoke-test: # LTV update needed as ltv ISM metadata files are used - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh - - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline - bash ci/smoke_test.sh || true - tar cJf logs.tar.xz out/logs/ - ls -al logs.tar.* @@ -1573,8 +1564,6 @@ ivas-interop-on-merge-request: - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/merge-request-print-pinned-commits.sh - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - # some helper variables - "|| true" to prevent failures from grep not finding anything # write to temporary file as workaround for failures observed with piping echo - echo $CI_MERGE_REQUEST_TITLE > tmp.txt @@ -1807,8 +1796,6 @@ renderer-usan: - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not model'" - fi - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - - make_args="CLANG=$CLANG_NUM" # for MRs to main, the whole sanitizer test takes too long (even with stv set of inputs) # shorten files to 1s for that case @@ -2248,7 +2235,6 @@ test-long-self-test: ;; esac - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - if [ $LEVEL_SCALING != "1.0" ]; then - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh - fi @@ -2497,8 +2483,6 @@ check-be-between-renderer-framesizes: - make clean - make -j - - python3 ci/remove_unsupported_testcases.py $PRM_FILES - - exit_code=0 # NOTE: here we do not use the "DUT_..CODER_PATH" variables because we do not build via a script, but directly from the make file (which is done because of the "make_args" - no way to inject that into build-binaries.sh) - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path ./IVAS_dec --update_ref 1 --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml || exit_code=$? @@ -3195,7 +3179,6 @@ ivas-conformance-linux: script: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh - - python3 ci/remove_unsupported_testcases.py $PRM_FILES # Should not be needed once the porting is done and all test cases are supported in BASOP/float. - make -j # To be substituted with reference platform build - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/ivas-conformance.sh -- GitLab From f42182aacd646d162836fad58394d452077e3c56 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 18 Nov 2025 10:54:40 +0100 Subject: [PATCH 2/3] do not run rtpdump tests for ivas-float-update --- main-basop.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/main-basop.yml b/main-basop.yml index 66607d2..86b95b6 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -293,6 +293,10 @@ workflow: - BUILD_WITH_DEBUG_MODE_INFO="true" - fi + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" + - fi + - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}") - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING" - summary_args="MLD DIFF SSNR ODG" @@ -432,6 +436,10 @@ workflow: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh - fi + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" + - fi + - echo "$FLOAT_REF_BRANCH - $FLOAT_REF_BRANCH_MERGE_SOURCE - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" # build merge target branch and correpsonding float reference - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref @@ -557,6 +565,10 @@ workflow: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh - fi + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" + - fi + # check MR title for flag that allows regressions to be mergable - echo $CI_MERGE_REQUEST_TITLE > tmp.txt - allow_regressions_flag=$(grep -c --ignore-case "\[allow[ -]*regression\]" tmp.txt) || true @@ -699,6 +711,10 @@ workflow: - testcase_timeout_arg="" - fi + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" + - fi + # NOTE: here we do not use the "DUT_..CODER_PATH" variables because we do not build via a script, but directly from the make file (which is done because of the "make_args" - no way to inject that into build-binaries.sh) - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml $testcase_timeout_arg --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec artifacts: @@ -1356,6 +1372,10 @@ ivas-pytest-on-merge-request: - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not model'" - fi + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" + - fi + ### prepare pytest # create references - python3 -m pytest "$TESTS_DIR_CODEC_BE_ON_MR"/"$PYTEST_SCRIPT" -v --update_ref 1 @@ -1564,6 +1584,10 @@ ivas-interop-on-merge-request: - source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/merge-request-print-pinned-commits.sh + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" + - fi + # some helper variables - "|| true" to prevent failures from grep not finding anything # write to temporary file as workaround for failures observed with piping echo - echo $CI_MERGE_REQUEST_TITLE > tmp.txt @@ -1796,6 +1820,10 @@ renderer-usan: - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not model'" - fi + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" + - fi + - make_args="CLANG=$CLANG_NUM" # for MRs to main, the whole sanitizer test takes too long (even with stv set of inputs) # shorten files to 1s for that case -- GitLab From df3f4160d5cb0ace8d80f38fb5a89a13bad8dd39 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 18 Nov 2025 11:42:14 +0100 Subject: [PATCH 3/3] no regression tests for rtdump cases (as float ref is involved) --- main-basop.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/main-basop.yml b/main-basop.yml index 86b95b6..30b1c4e 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -436,9 +436,8 @@ workflow: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh - fi - - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then - - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" - - fi + # TODO: remove once ref branch is switched + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" - echo "$FLOAT_REF_BRANCH - $FLOAT_REF_BRANCH_MERGE_SOURCE - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" # build merge target branch and correpsonding float reference @@ -565,9 +564,8 @@ workflow: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh - fi - - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then - - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" - - fi + # TODO: remove once ref branch is switched + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" # check MR title for flag that allows regressions to be mergable - echo $CI_MERGE_REQUEST_TITLE > tmp.txt -- GitLab