From f28bc4015c44c354d20698da561c67d4c24a456a Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 18 Nov 2025 17:34:56 -0600 Subject: [PATCH 1/2] Fix for ivas-pytest-anchor --- main-basop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main-basop.yml b/main-basop.yml index 30b1c4e..e556c86 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -293,7 +293,7 @@ workflow: - BUILD_WITH_DEBUG_MODE_INFO="true" - fi - - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "ivas-float-update" ]; then + - if [ "$FLOAT_REF_BRANCH" == "ivas-float-update" ]; then - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" - fi -- GitLab From c69053780de27df49ad5082fc7585d6a6ae86547 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 19 Nov 2025 08:31:02 +0100 Subject: [PATCH 2/2] fix exclusion of rtpdump tests for scheduled tests --- main-basop.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/main-basop.yml b/main-basop.yml index e556c86..7053cf3 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -293,9 +293,7 @@ workflow: - BUILD_WITH_DEBUG_MODE_INFO="true" - fi - - if [ "$FLOAT_REF_BRANCH" == "ivas-float-update" ]; then - - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" - - fi + - export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not rtpdump'" - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}") - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING" @@ -709,10 +707,6 @@ 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: @@ -1805,7 +1799,7 @@ renderer-usan: - report-junit-5ms.xml # From float repo -# to be reused in MR and LTV-scheduled sanitizer test jobs +# to be reused in MR test jobs # set CLANG_NUM, SELFTEST_SANITY_TIMEOUT and SELF_TEST_PRM_FILE in before_script section .sanitizer-selftest-anchor: &sanitizer-selftest-anchor - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh -- GitLab