From 868dd2439660c01d806e5264ee392e873ce51a35 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Apr 2025 17:12:17 +0200 Subject: [PATCH 01/25] add DISABLE_LIMITER switch and framesize-be test --- .gitlab-ci.yml | 46 +++++++++++++++++++++++++++++++++++++++++++++ lib_com/options.h | 2 ++ lib_rend/lib_rend.c | 4 ++++ 3 files changed, 52 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a00af3162..36768312d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -998,6 +998,52 @@ check-regressions-short-dec--10db: # -10dB LEVEL_SCALING: "0.3162" +check-be-between-renderer-framesizes: + extends: + - .test-job-linux + - .rules-pytest-to-main-short + stage: test + needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] + script: + - *print-common-info + - *disable-limiter + - *build-float-ref-and-dut-binaries + - pytest_args="$SHORT_TEST_SUITE --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec" + + - python3 -m pytest --update_ref 1 "$pytest_args" + + - exit_code=0 + - exit_code5=0 + - exit_code10=0 + - python3 -m pytest $pytest_args --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$? + - python3 -m pytest $pytest_args --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only || exit_code10=$? + + - zero_errors5=$(cat report-junit-5ms.xml | grep -c 'errors="0"') || true + - zero_errors10=$(cat report-junit-10ms.xml | grep -c 'errors="0"') || true + - zero_errors=1 + + - if [ $zero_errors5 != 1 ]; then echo "run error in with 5ms rendering encountered"; zero_errors=0 ; fi + - if [ $zero_errors10 != 1 ]; then echo "run error in with 10ms rendering encountered"; zero_errors=0 ; fi + - if [ $zero_errors != 1 ]; then exit $EXIT_CODE_FAIL; fi + - if [ $exit_code5 -ne 0 ]; then echo "Non-bitexact cases encountered with 5ms rendering!"; exit_code=1; fi + - if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi + - if [ $exit_code -ne 0 ]; then exit $EXIT_CODE_FAIL; fi + artifacts: + name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" + expire_in: 1 week + when: always + expose_as: "pytest 5ms and 10ms vs 20ms results" + paths: + - report-junit-5ms.xml + - report-5ms.html + - report-junit-10ms.xml + - report-10ms.html + reports: + junit: + - report-junit-5ms.xml + - report-junit-10ms.xml + + # --------------------------------------------------------------- # Short test jobs for running from web interface or schedule # --------------------------------------------------------------- diff --git a/lib_com/options.h b/lib_com/options.h index cbc77b6e7..646bb3ff2 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -61,6 +61,8 @@ /*#define MEM_COUNT_DETAILS*/ /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */ #endif +#define DISABLE_LIMITER + /* #################### End DEBUGGING switches ############################ */ #ifndef BASOP_NOGLOB_DEV_USE_GLOBALS diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index e39b9a61e..6f85b8fa0 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -350,6 +350,7 @@ static void accumulate2dArrayToBuffer_fx( * In-place saturation control for multichannel buffers with adaptive release time *-------------------------------------------------------------------*/ +#ifndef DISABLE_LIMITER /*! r: number of clipped output samples */ static Word32 limitRendererOutput_fx( IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ @@ -393,6 +394,7 @@ static Word32 limitRendererOutput_fx( return numClipping; } +#endif /*-------------------------------------------------------------------* * validateOutputAudioConfig() @@ -7361,7 +7363,9 @@ static ivas_error getSamplesInternal( test(); Word32 limiter_thresold = L_lshl( IVAS_LIMITER_THRESHOLD, *outAudio.pq_fact ); +#ifndef DISABLE_LIMITER limitRendererOutput_fx( hIvasRend->hLimiter, outAudio.data_fx, outAudio.config.numSamplesPerChannel, limiter_thresold, *outAudio.pq_fact ); +#endif /* update global cominbed orientation start index */ ivas_combined_orientation_update_start_index( hIvasRend->hCombinedOrientationData, outAudio.config.numSamplesPerChannel ); -- GitLab From 7f31b3174b49885e497b851597fff9d564358bea Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Apr 2025 17:16:35 +0200 Subject: [PATCH 02/25] fix CI setup --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36768312d..41a138d6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1003,7 +1003,7 @@ check-be-between-renderer-framesizes: - .test-job-linux - .rules-pytest-to-main-short stage: test - needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] + needs: ["build-codec-linux-make"] script: - *print-common-info - *disable-limiter -- GitLab From 662aeb4527ead3e2234e0f3da87cccc0dcd284ed Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Apr 2025 17:23:28 +0200 Subject: [PATCH 03/25] deactivate DISABLE_LIMITER --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 646bb3ff2..673fcae4d 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -61,7 +61,7 @@ /*#define MEM_COUNT_DETAILS*/ /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */ #endif -#define DISABLE_LIMITER +/*#define DISABLE_LIMITER*/ /* #################### End DEBUGGING switches ############################ */ -- GitLab From 4c94d705e6fa65644ee7c3cfa96abb203bab1326 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 25 Apr 2025 17:13:52 +0200 Subject: [PATCH 04/25] [revert-me] point to wip branch in ci repo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41a138d6a..53ec5f6e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 4eb4c0dfbdc845280a9994b5f7540f69c737537b + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF framesize-be-test-to-basop include: - local: .gitlab-ci/variables.yml -- GitLab From 415250fa874a2d32b875482cc3f8a252dda0d047 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 25 Apr 2025 17:15:53 +0200 Subject: [PATCH 05/25] use snippets instead of yaml anchors --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53ec5f6e5..e4c552cde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1005,9 +1005,9 @@ check-be-between-renderer-framesizes: stage: test needs: ["build-codec-linux-make"] script: - - *print-common-info - - *disable-limiter - - *build-float-ref-and-dut-binaries + - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh + - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh + - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh - pytest_args="$SHORT_TEST_SUITE --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec" - python3 -m pytest --update_ref 1 "$pytest_args" -- GitLab From 464e2f9c571f72e814b6a2285a94b75b66d9faec Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 25 Apr 2025 19:02:02 +0200 Subject: [PATCH 06/25] use commit sha instead of branch name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4c552cde..f3adb0c7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF framesize-be-test-to-basop + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 74a8d426730ed21183fe047503e7097262fcb796 include: - local: .gitlab-ci/variables.yml -- GitLab From 7d21ca8a794b7ff59fa8b2b2ec43c102e0d52f38 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 28 Apr 2025 07:23:59 +0200 Subject: [PATCH 07/25] fix build for framesize-be-test --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3adb0c7a..8589c4094 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1007,7 +1007,8 @@ check-be-between-renderer-framesizes: script: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh - - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh + - make clean + - make -j "${nproc}" - pytest_args="$SHORT_TEST_SUITE --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec" - python3 -m pytest --update_ref 1 "$pytest_args" -- GitLab From 9c50097157b901617b3818c75a642b40e2bb6461 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Sun, 27 Apr 2025 09:46:59 +0200 Subject: [PATCH 08/25] Attempt to fix missing rules and missing fetch of ci scripts --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8589c4094..5b77d3bb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -195,6 +195,8 @@ workflow: IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME" IMAGES_ARTIFACT_SPLIT: "images_split_$CI_JOB_NAME" script: + - !reference [ .job-linux, before_script ] + - set -euxo pipefail - 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 @@ -318,6 +320,7 @@ workflow: .check-be-job: extends: - .test-job-linux + - .rules-pytest-to-main-short before_script: - !reference [ .test-job-linux, before_script ] - rm -rf tests/dut tests/ref -- GitLab From 0fd4d559f75ae967d5631610db971302b2d42596 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Sun, 27 Apr 2025 20:59:49 +0200 Subject: [PATCH 09/25] Add fix to pages job --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b77d3bb8..596c973b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1977,6 +1977,8 @@ pages: rules: - if: $UPDATE_PAGES script: + - !reference [ .job-linux, before_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/setup_pages.py -- GitLab From 0987e660e150af270960c3918893964a01d4be6e Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Fri, 25 Apr 2025 11:57:02 +0530 Subject: [PATCH 10/25] Fix for 3GPP issue 1508: BASOP decoder asserts in ivas_wb_tbe_dec_fx with OMASA FER bitstream from BASOP encoder Link #1508 --- lib_com/swb_tbe_com_fx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib_com/swb_tbe_com_fx.c b/lib_com/swb_tbe_com_fx.c index 5f391b271..5631dfa94 100644 --- a/lib_com/swb_tbe_com_fx.c +++ b/lib_com/swb_tbe_com_fx.c @@ -1645,7 +1645,12 @@ void GenShapedWBExcitation_ivas_fx( } } - Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER_WB, exc4kWhtnd, excSHB, L_FRAME16k / 4, state_lpc_syn, 1 ); + Scale_sig( state_lpc_syn, LPC_SHB_ORDER, -Q2 ); /* Q(Q_bwe_exc) -> Q(Q_bwe_exc - 2) */ + + Syn_filt_s( Q2, lpc_shb, LPC_SHB_ORDER_WB, exc4kWhtnd, excSHB, L_FRAME16k / 4, state_lpc_syn, 1 ); + + Scale_sig( state_lpc_syn, LPC_SHB_ORDER, Q2 ); /* Q(Q_bwe_exc - 2) -> Q(Q_bwe_exc) */ + Scale_sig( excSHB, L_FRAME16k / 4, Q2 ); /* Q(Q_bwe_exc - 2) -> Q(Q_bwe_exc) */ return; } -- GitLab From 9cc2505f643f0a6f765e283f4ab2939cca604134 Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Mon, 28 Apr 2025 08:50:42 +0530 Subject: [PATCH 11/25] Fix for renderer crashes in CI ltv test --- lib_rend/ivas_dirac_rend_fx.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib_rend/ivas_dirac_rend_fx.c b/lib_rend/ivas_dirac_rend_fx.c index 2540426cc..06b37ff5a 100644 --- a/lib_rend/ivas_dirac_rend_fx.c +++ b/lib_rend/ivas_dirac_rend_fx.c @@ -5007,10 +5007,20 @@ static void ivas_masa_ext_dirac_render_sf_fx( ELSE { /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */ + /* cldfb_state_fx should be in 1 less q-factor compared to cld buffers for cldfbSynthesis_ivas_fx function */ Word16 q_out = sub( q_cldfb, 1 ); - scale_sig32( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ); // q_out - hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state = q_out; - move16(); + Word16 max_shift = L_norm_arr( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length ); + IF( GT_16( max_shift, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ) ) + { + scale_sig32( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ); // q_out + hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state = q_out; + move16(); + } + ELSE + { + scale_sig32( Cldfb_RealBuffer_fx[idx_in][i], hSpatParamRendCom->num_freq_bands, sub( hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state, q_out ) ); + scale_sig32( Cldfb_ImagBuffer_fx[idx_in][i], hSpatParamRendCom->num_freq_bands, sub( hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state, q_out ) ); + } FOR( i = 0; i < hSpatParamRendCom->subframe_nbslots[subframe_idx]; i++ ) { RealBuffer_fx[i] = Cldfb_RealBuffer_fx[idx_in][i]; // q_cldfb -- GitLab From 877a75aace513c106243d92e10938e4c034d516b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 28 Apr 2025 08:12:38 +0200 Subject: [PATCH 12/25] remove nproc again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 596c973b9..945de8500 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1011,7 +1011,7 @@ check-be-between-renderer-framesizes: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh - make clean - - make -j "${nproc}" + - make -j - pytest_args="$SHORT_TEST_SUITE --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec" - python3 -m pytest --update_ref 1 "$pytest_args" -- GitLab From 66578364d370196d64f463f92ee3c84f01e0adad Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 10:07:39 +0200 Subject: [PATCH 13/25] update CI repo sHA --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e110e0aed..40d84a699 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 41186736915f5c0a857ac92e8ab438c434e5247d + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF a31272de16bd1b556269a50bc179321a60f2a500 include: - local: .gitlab-ci/variables.yml -- GitLab From c809bdea7674b8f96f09ffc3b843be6af3d4f854 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 10:32:21 +0200 Subject: [PATCH 14/25] add reference to before_script --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40d84a699..a39762643 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1066,13 +1066,14 @@ check-be-between-renderer-framesizes: stage: test needs: ["build-codec-linux-make"] script: - - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh + - !reference [ .test-job-linux, before_script ] - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh - make clean - make -j + - echo "$SHORT_TEST_SUITE" - pytest_args="$SHORT_TEST_SUITE --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec" - - python3 -m pytest --update_ref 1 "$pytest_args" + - python3 -m pytest "$pytest_args" --update_ref 1 - exit_code=0 - exit_code5=0 -- GitLab From fb5d39168462c39caeec259c5d062e099454b8bd Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 10:33:54 +0200 Subject: [PATCH 15/25] [revert-me] temporarily disable some jobs --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a39762643..5548bb308 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -850,7 +850,7 @@ build-codec-linux-make: - make -j # ensure that codec builds on linux with instrumentation active -build-codec-linux-instrumented-make: +.build-codec-linux-instrumented-make: rules: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -867,7 +867,7 @@ build-codec-linux-instrumented-make: - bash scripts/prepare_instrumentation.sh -m MEM_ONLY - make -j -C $INSTR_DIR -build-codec-linux-debugging-make: +.build-codec-linux-debugging-make: rules: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -885,7 +885,7 @@ build-codec-linux-debugging-make: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/activate-debug-mode-info-if-set.sh - make -j -build-codec-windows-msbuild: +.build-codec-windows-msbuild: rules: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -908,7 +908,7 @@ build-codec-windows-msbuild: # --------------------------------------------------------------- ### jobs that check for bitexactness of fx encoder and decoder -check-be-to-target-short-enc-0db: +.check-be-to-target-short-enc-0db: extends: - .check-be-to-target-job variables: @@ -919,7 +919,7 @@ check-be-to-target-short-enc-0db: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -check-be-to-target-short-enc-+10db: +.check-be-to-target-short-enc-+10db: extends: - .check-be-to-target-job variables: @@ -930,7 +930,7 @@ check-be-to-target-short-enc-+10db: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -check-be-to-target-short-enc--10db: +.check-be-to-target-short-enc--10db: extends: - .check-be-to-target-job variables: @@ -941,7 +941,7 @@ check-be-to-target-short-enc--10db: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -check-be-to-target-short-dec-0db: +.check-be-to-target-short-dec-0db: extends: - .check-be-to-target-job variables: @@ -952,7 +952,7 @@ check-be-to-target-short-dec-0db: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -check-be-to-target-short-dec-+10db: +.check-be-to-target-short-dec-+10db: extends: - .check-be-to-target-job variables: @@ -963,7 +963,7 @@ check-be-to-target-short-dec-+10db: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -check-be-to-target-short-dec--10db: +.check-be-to-target-short-dec--10db: extends: - .check-be-to-target-job variables: @@ -975,7 +975,7 @@ check-be-to-target-short-dec--10db: MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" ### jobs that check for regressions on non-BE testcases -check-regressions-short-enc-0db: +.check-regressions-short-enc-0db: extends: - .check-regressions-pytest-job needs: @@ -989,7 +989,7 @@ check-regressions-short-enc-0db: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -check-regressions-short-enc-+10db: +.check-regressions-short-enc-+10db: extends: - .check-regressions-pytest-job needs: @@ -1003,7 +1003,7 @@ check-regressions-short-enc-+10db: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -check-regressions-short-enc--10db: +.check-regressions-short-enc--10db: extends: - .check-regressions-pytest-job needs: @@ -1017,7 +1017,7 @@ check-regressions-short-enc--10db: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -check-regressions-short-dec-0db: +.check-regressions-short-dec-0db: extends: - .check-regressions-pytest-job needs: @@ -1031,7 +1031,7 @@ check-regressions-short-dec-0db: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -check-regressions-short-dec-+10db: +.check-regressions-short-dec-+10db: extends: - .check-regressions-pytest-job needs: @@ -1045,7 +1045,7 @@ check-regressions-short-dec-+10db: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -check-regressions-short-dec--10db: +.check-regressions-short-dec--10db: extends: - .check-regressions-pytest-job needs: @@ -1540,7 +1540,7 @@ coverage-test-on-main-scheduled: # --------------------------------------------------------------- # check bitexactness to EVS -be-2-evs-26444: +.be-2-evs-26444: extends: - .test-job-linux rules: -- GitLab From 9daed1624511bb5e2e79454fa7c7955a77477261 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 10:49:01 +0200 Subject: [PATCH 16/25] fix obsolete reference call and add dbg output --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5548bb308..36ae9e0cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1066,13 +1066,15 @@ check-be-between-renderer-framesizes: stage: test needs: ["build-codec-linux-make"] script: - - !reference [ .test-job-linux, before_script ] - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-limiter.sh - make clean - make -j - echo "$SHORT_TEST_SUITE" - pytest_args="$SHORT_TEST_SUITE --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec" + - ls -l + - echo "$pytest_args" + - set euxo - python3 -m pytest "$pytest_args" --update_ref 1 - exit_code=0 -- GitLab From 9b60e5901202deddb2609df16ed19ca839796ec0 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 10:59:07 +0200 Subject: [PATCH 17/25] try direct putting the command --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36ae9e0cd..ddb15f700 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1075,7 +1075,8 @@ check-be-between-renderer-framesizes: - ls -l - echo "$pytest_args" - set euxo - - python3 -m pytest "$pytest_args" --update_ref 1 + - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 + # - python3 -m pytest "$pytest_args" --update_ref 1 - exit_code=0 - exit_code5=0 -- GitLab From 6ea8b19de1a60324c8f9d053d936a86cad07bfc2 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 11:45:07 +0200 Subject: [PATCH 18/25] add missing build --- .gitlab-ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddb15f700..b477d0852 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1070,19 +1070,15 @@ check-be-between-renderer-framesizes: - make clean - make -j - echo "$SHORT_TEST_SUITE" - - pytest_args="$SHORT_TEST_SUITE --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec" - - ls -l - - echo "$pytest_args" - - set euxo + - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 - # - python3 -m pytest "$pytest_args" --update_ref 1 - exit_code=0 - exit_code5=0 - exit_code10=0 - - python3 -m pytest $pytest_args --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$? - - python3 -m pytest $pytest_args --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only || exit_code10=$? + - python3 -m pytest $tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$? + - python3 -m pytest $tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only || exit_code10=$? - zero_errors5=$(cat report-junit-5ms.xml | grep -c 'errors="0"') || true - zero_errors10=$(cat report-junit-10ms.xml | grep -c 'errors="0"') || true -- GitLab From 724af1624dd863a2a61a849ac030cdea5b4a6d2e Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 12:14:11 +0200 Subject: [PATCH 19/25] remove unsupported testcases before running --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b477d0852..f36594e12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1072,9 +1072,12 @@ check-be-between-renderer-framesizes: - echo "$SHORT_TEST_SUITE" - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh - - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 + - python3 ci/remove_unsupported_testcases.py $PRM_FILES - exit_code=0 + - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 || exit_code=$? + - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors." exit 1; fi + - exit_code5=0 - exit_code10=0 - python3 -m pytest $tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$? -- GitLab From a8f56457e553c93c45c923f8cc7af693cc769846 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 24 Jun 2025 14:34:25 +0200 Subject: [PATCH 20/25] fix typos --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f36594e12..3a3a4b728 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1080,8 +1080,8 @@ check-be-between-renderer-framesizes: - exit_code5=0 - exit_code10=0 - - python3 -m pytest $tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$? - - python3 -m pytest $tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only || exit_code10=$? + - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only || exit_code5=$? + - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only || exit_code10=$? - zero_errors5=$(cat report-junit-5ms.xml | grep -c 'errors="0"') || true - zero_errors10=$(cat report-junit-10ms.xml | grep -c 'errors="0"') || true -- GitLab From 4542ebc70f732c58bbf35a046b30d78be1de5875 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 26 Jun 2025 10:55:44 +0200 Subject: [PATCH 21/25] add 20ms run report to artifacts and do not stop if there was an error --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 814f08372..7dcfbab05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1076,8 +1076,8 @@ check-be-between-renderer-framesizes: - python3 ci/remove_unsupported_testcases.py $PRM_FILES - exit_code=0 - - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 || exit_code=$? - - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors." exit 1; fi + - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml || exit_code=$? + - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors."; fi - exit_code5=0 - exit_code10=0 @@ -1104,10 +1104,13 @@ check-be-between-renderer-framesizes: - report-5ms.html - report-junit-10ms.xml - report-10ms.html + - report-junit-20ms.xml + - report-20ms.html reports: junit: - report-junit-5ms.xml - report-junit-10ms.xml + - report-junit-20ms.xml # --------------------------------------------------------------- -- GitLab From 0e71dd31a8ddd83829d51928cc82973a81f14f80 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 26 Jun 2025 11:06:25 +0200 Subject: [PATCH 22/25] make framesize-be test manual only --- .gitlab-ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7dcfbab05..832e5af6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1063,7 +1063,9 @@ build-codec-linux-make: check-be-between-renderer-framesizes: extends: - .test-job-linux - - .rules-pytest-to-main-short + # - .rules-pytest-to-main-short + rules: + - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "renderer-framesize-be" stage: test needs: ["build-codec-linux-make"] script: @@ -1077,7 +1079,6 @@ check-be-between-renderer-framesizes: - exit_code=0 - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml || exit_code=$? - - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors."; fi - exit_code5=0 - exit_code10=0 @@ -1088,8 +1089,11 @@ check-be-between-renderer-framesizes: - zero_errors10=$(cat report-junit-10ms.xml | grep -c 'errors="0"') || true - zero_errors=1 - - if [ $zero_errors5 != 1 ]; then echo "run error in with 5ms rendering encountered"; zero_errors=0 ; fi - - if [ $zero_errors10 != 1 ]; then echo "run error in with 10ms rendering encountered"; zero_errors=0 ; fi + - *print-results-banner + - echo "!! Encoder command lines are in the 20ms log files only !!!" + - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors."; zero_errors=0 fi + - if [ $zero_errors5 != 1 ]; then echo "run error with 5ms rendering encountered"; zero_errors=0 ; fi + - if [ $zero_errors10 != 1 ]; then echo "run error with 10ms rendering encountered"; zero_errors=0 ; fi - if [ $zero_errors != 1 ]; then exit $EXIT_CODE_FAIL; fi - if [ $exit_code5 -ne 0 ]; then echo "Non-bitexact cases encountered with 5ms rendering!"; exit_code=1; fi - if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi -- GitLab From f305131ca8123c51b5dc370f46180527420d471e Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 26 Jun 2025 11:07:40 +0200 Subject: [PATCH 23/25] Revert "[revert-me] temporarily disable some jobs" This reverts commit fb5d39168462c39caeec259c5d062e099454b8bd. --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 832e5af6c..47ca66996 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -851,7 +851,7 @@ build-codec-linux-make: - make -j # ensure that codec builds on linux with instrumentation active -.build-codec-linux-instrumented-make: +build-codec-linux-instrumented-make: rules: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -868,7 +868,7 @@ build-codec-linux-make: - bash scripts/prepare_instrumentation.sh -m MEM_ONLY - make -j -C $INSTR_DIR -.build-codec-linux-debugging-make: +build-codec-linux-debugging-make: rules: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -886,7 +886,7 @@ build-codec-linux-make: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/activate-debug-mode-info-if-set.sh - make -j -.build-codec-windows-msbuild: +build-codec-windows-msbuild: rules: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -909,7 +909,7 @@ build-codec-linux-make: # --------------------------------------------------------------- ### jobs that check for bitexactness of fx encoder and decoder -.check-be-to-target-short-enc-0db: +check-be-to-target-short-enc-0db: extends: - .check-be-to-target-job variables: @@ -920,7 +920,7 @@ build-codec-linux-make: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -.check-be-to-target-short-enc-+10db: +check-be-to-target-short-enc-+10db: extends: - .check-be-to-target-job variables: @@ -931,7 +931,7 @@ build-codec-linux-make: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -.check-be-to-target-short-enc--10db: +check-be-to-target-short-enc--10db: extends: - .check-be-to-target-job variables: @@ -942,7 +942,7 @@ build-codec-linux-make: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -.check-be-to-target-short-dec-0db: +check-be-to-target-short-dec-0db: extends: - .check-be-to-target-job variables: @@ -953,7 +953,7 @@ build-codec-linux-make: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -.check-be-to-target-short-dec-+10db: +check-be-to-target-short-dec-+10db: extends: - .check-be-to-target-job variables: @@ -964,7 +964,7 @@ build-codec-linux-make: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -.check-be-to-target-short-dec--10db: +check-be-to-target-short-dec--10db: extends: - .check-be-to-target-job variables: @@ -976,7 +976,7 @@ build-codec-linux-make: MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" ### jobs that check for regressions on non-BE testcases -.check-regressions-short-enc-0db: +check-regressions-short-enc-0db: extends: - .check-regressions-pytest-job needs: @@ -990,7 +990,7 @@ build-codec-linux-make: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -.check-regressions-short-enc-+10db: +check-regressions-short-enc-+10db: extends: - .check-regressions-pytest-job needs: @@ -1004,7 +1004,7 @@ build-codec-linux-make: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -.check-regressions-short-enc--10db: +check-regressions-short-enc--10db: extends: - .check-regressions-pytest-job needs: @@ -1018,7 +1018,7 @@ build-codec-linux-make: DUT_DECODER_PATH: "$REF_DECODER_PATH" MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH" -.check-regressions-short-dec-0db: +check-regressions-short-dec-0db: extends: - .check-regressions-pytest-job needs: @@ -1032,7 +1032,7 @@ build-codec-linux-make: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -.check-regressions-short-dec-+10db: +check-regressions-short-dec-+10db: extends: - .check-regressions-pytest-job needs: @@ -1046,7 +1046,7 @@ build-codec-linux-make: DUT_ENCODER_PATH: "$REF_ENCODER_PATH" MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH" -.check-regressions-short-dec--10db: +check-regressions-short-dec--10db: extends: - .check-regressions-pytest-job needs: @@ -1550,7 +1550,7 @@ coverage-test-on-main-scheduled: # --------------------------------------------------------------- # check bitexactness to EVS -.be-2-evs-26444: +be-2-evs-26444: extends: - .test-job-linux rules: -- GitLab From 427770e1b92497a448280f5adf4d3aac171e2087 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 26 Jun 2025 11:10:54 +0200 Subject: [PATCH 24/25] allow to start framesize test from web interface --- .gitlab-ci.yml | 3 +++ .gitlab-ci/variables.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47ca66996..2ec72727a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,6 +62,9 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'voip-be-test' variables: IVAS_PIPELINE_NAME: 'Voip BE test on $CI_COMMIT_BRANCH' + - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'renderer-framesize-be' + variables: + IVAS_PIPELINE_NAME: 'Renderer framesize BE test on $CI_COMMIT_BRANCH' - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough' variables: IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH' diff --git a/.gitlab-ci/variables.yml b/.gitlab-ci/variables.yml index 0c212d312..d91866b86 100644 --- a/.gitlab-ci/variables.yml +++ b/.gitlab-ci/variables.yml @@ -63,4 +63,5 @@ variables: - 'complexity' - 'coverage' - 'voip-be-test' + - 'renderer-framesize-be' - 'peaq-enc-passthrough' -- GitLab From b6dbf27abe0e2f1d0a8c657e024ce1e453171619 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 30 Jun 2025 13:19:55 +0200 Subject: [PATCH 25/25] fix missing ; --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ec72727a..0c61cf5b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1094,7 +1094,7 @@ check-be-between-renderer-framesizes: - *print-results-banner - echo "!! Encoder command lines are in the 20ms log files only !!!" - - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors."; zero_errors=0 fi + - if [ $exit_code -ne 0 ]; then echo "20 ms framesize run already failed with errors."; zero_errors=0; fi - if [ $zero_errors5 != 1 ]; then echo "run error with 5ms rendering encountered"; zero_errors=0 ; fi - if [ $zero_errors10 != 1 ]; then echo "run error with 10ms rendering encountered"; zero_errors=0 ; fi - if [ $zero_errors != 1 ]; then exit $EXIT_CODE_FAIL; fi -- GitLab