From 94b8dca70e8b364f4dc6e75852111d1876ff84f3 Mon Sep 17 00:00:00 2001
From: Jan Kiene <jan.kiene@iis.fraunhofer.de>
Date: Mon, 14 Apr 2025 11:53:43 +0200
Subject: [PATCH 1/2] supress output from all make cmds in non-biuld tests

if build test is fine, we don't need this info here and all the
printouts from make reall clutter the job log
---
 .gitlab-ci.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3fa4217b..412f11044 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,7 +171,7 @@ stages:
   - git pull origin $FLOAT_REF_BRANCH
   - *activate-debug-mode-info-if-set
   - make clean
-  - make -j
+  - make -j >> /dev/null
   - mv ./IVAS_cod ./$REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
   - mv ./IVAS_dec ./$REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
   - mv ./IVAS_rend ./IVAS_rend_ref
@@ -187,7 +187,7 @@ stages:
   - git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
   - *activate-debug-mode-info-if-set
   - make clean
-  - make -j
+  - make -j >> /dev/null
   - mv ./IVAS_cod ./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
   - mv ./IVAS_dec ./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
   - mv ./IVAS_rend ./IVAS_rend_merge_target
@@ -202,7 +202,7 @@ stages:
 ### build dut binaries
   - *activate-debug-mode-info-if-set
   - make clean
-  - make -j
+  - make -j >> /dev/null
 
 .build-and-create-float-ref-outputs: &build-and-create-float-ref-outputs
   - *build-float-ref-and-dut-binaries
@@ -509,7 +509,7 @@ stages:
     - *build-float-ref-binaries
     - *build-merge-target-binaries
     - make clean
-    - make -j
+    - make -j >> /dev/null
     - *check-up-to-date-in-comparison-jobs
 
     - exit_code_target=0
@@ -660,7 +660,7 @@ stages:
     - git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
     - git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
     - make clean
-    - make -j
+    - make -j >> /dev/null
     # need to restore cache again
     - *overwrite-pytest-cache-with-artifact
     - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
@@ -759,7 +759,7 @@ stages:
     -   make_args="$make_args IGNORELIST=1"
     - fi
     - make clean
-    - make -j $make_args
+    - make -j $make_args >> /dev/null
     - testcase_timeout_arg="--testcase_timeout $TESTCASE_TIMEOUT_LTV_SANITIZERS"
     # disable per-testcase timeout for msan to evaluate what is going on that it takes so long
     - if [[ $CLANG_NUM = 1 ]]; then
@@ -1536,7 +1536,7 @@ coverage-test-on-main-scheduled:
     - *copy-ltv-files-to-testv-dir
     - *build-float-ref-binaries
     # Build DuT binaries with GCOV
-    - make clean
+    - make clean >> /dev/null
     - make GCOV=1 -j
     - cp IVAS_rend IVAS_rend_ref # Copy to ensure instrumented renderer is run in the first pytest call
 
@@ -1594,7 +1594,7 @@ be-2-evs-26444:
     - *print-common-info
     - *update-scripts-repo
     - sed -i".bak" "s/\(#define EVS_FLOAT\)/\/\/\1/" lib_com/options.h
-    - make -j
+    - make -j  >> /dev/null
 
     # copy over to never change the testvector dir
     - cp -r $EVS_BE_TEST_DIR_BASOP ./evs_be_test
@@ -1658,7 +1658,7 @@ voip-be-on-merge-request:
   script:
     - *print-common-info
     - make clean
-    - make -j
+    - make -j >> /dev/null
     - python3 -m pytest tests/test_be_for_jbm_neutral_dly_profile.py
 
 
-- 
GitLab


From 279ddadeaa7cb7c303ee1330e0027430dcba809d Mon Sep 17 00:00:00 2001
From: Jan Kiene <jan.kiene@iis.fraunhofer.de>
Date: Mon, 14 Apr 2025 15:56:57 +0200
Subject: [PATCH 2/2] make the commit number files textfiles so one can view
 them in gitlab ui

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 412f11044..d3f7ba999 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,9 +48,9 @@ variables:
   FAILED_TESTCASES_LIST: "failed-testcases.txt"
   ERRORS_TESTCASES_LIST: "errors-testcases.txt"
   PYTEST_CACHE_ARTIFACT: "pytest_cache.zip"
-  FLOAT_REF_COMMIT_FILE: "float-ref-git-sha"
-  CUT_COMMIT_FILE: "CuT-git-sha"
-  MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha"
+  FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
+  CUT_COMMIT_FILE: "CuT-git-sha.txt"
+  MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
   MANUAL_PIPELINE_TYPE:
     description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
     value: 'default'
-- 
GitLab