From ab953740461977eb13f5c74322278439cb4b8156 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Fri, 30 Jun 2023 09:58:32 +0200
Subject: [PATCH 1/2] fail complexity jobs when a mode fails

stil upload all data for the successful modes
---
 .gitlab-ci.yml                         | 19 +++++++++++++------
 ci/complexity_measurements/getWmops.sh |  5 ++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b365c0e22d..7f461d4df7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1193,6 +1193,7 @@ coverage-test-on-main-scheduled:
   stage: test
   artifacts:
     name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
+    when: always
     expire_in: 1 week
     paths:
       - $CI_JOB_NAME-public
@@ -1208,8 +1209,9 @@ complexity-stereo-in-stereo-out:
     - *complexity-measurements-setup
     - in_format=stereo
     - out_format=stereo
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
 
 complexity-ism-in-binaural-out:
   extends:
@@ -1224,8 +1226,9 @@ complexity-ism-in-binaural-out:
     - *complexity-measurements-setup
     - in_format=ISM
     - out_format=BINAURAL
-    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"
+    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
 
 complexity-sba-hoa3-in-hoa3-out:
   extends:
@@ -1240,8 +1243,9 @@ complexity-sba-hoa3-in-hoa3-out:
     - *complexity-measurements-setup
     - in_format=SBA
     - out_format=HOA3
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
 
 complexity-mc-in-7_1_4-out:
   extends:
@@ -1256,8 +1260,9 @@ complexity-mc-in-7_1_4-out:
     - *complexity-measurements-setup
     - in_format=MC
     - out_format=7_1_4
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
 
 complexity-masa-in-7_1_4-out:
   extends:
@@ -1272,8 +1277,9 @@ complexity-masa-in-7_1_4-out:
     - *complexity-measurements-setup
     - in_format=MASA
     - out_format=7_1_4
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
 
 complexity-StereoDmxEVS-stereo-in-mono-out:
   extends:
@@ -1288,8 +1294,9 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
     - *complexity-measurements-setup
     - in_format=StereoDmxEVS
     - out_format=mono
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
     - *complexity-measurements-prepare-artifacts
+    - exit $ret_val
 
 # ---------------------------------------------------------------
 # Other jobs
diff --git a/ci/complexity_measurements/getWmops.sh b/ci/complexity_measurements/getWmops.sh
index baec52ab6f..e81575892b 100755
--- a/ci/complexity_measurements/getWmops.sh
+++ b/ci/complexity_measurements/getWmops.sh
@@ -53,8 +53,11 @@ config_file="scripts/config/ci_linux_ltv.json"
 wmopsFilenameFlcLast=wmops_newsletter_stereo__${commit_sha}_${date}
 wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}
 
+ret_val=0
+
 # instrument and build
 ./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format -f ${ep} --oc $output_format
+ret_val=$?
 
 # get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode
 ### WMOPS
@@ -83,4 +86,4 @@ ${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameF
 # generate java script from database
 tcsh ${scriptDir}/genWebpageData_Rom.csh ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/graphs_rom_flc.js Graphs_ROM
 
-
+exit $ret_val
\ No newline at end of file
-- 
GitLab


From 7d1fb57939a87cbe58af22c6ad004d94fe1800e4 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Fri, 30 Jun 2023 11:09:49 +0200
Subject: [PATCH 2/2] get return value from getWmops correctly

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f461d4df7..6fc7d44893 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1209,7 +1209,8 @@ complexity-stereo-in-stereo-out:
     - *complexity-measurements-setup
     - in_format=stereo
     - out_format=stereo
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1226,7 +1227,8 @@ complexity-ism-in-binaural-out:
     - *complexity-measurements-setup
     - in_format=ISM
     - out_format=BINAURAL
-    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"
+    - ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1243,7 +1245,8 @@ complexity-sba-hoa3-in-hoa3-out:
     - *complexity-measurements-setup
     - in_format=SBA
     - out_format=HOA3
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1260,7 +1263,8 @@ complexity-mc-in-7_1_4-out:
     - *complexity-measurements-setup
     - in_format=MC
     - out_format=7_1_4
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1277,7 +1281,8 @@ complexity-masa-in-7_1_4-out:
     - *complexity-measurements-setup
     - in_format=MASA
     - out_format=7_1_4
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1294,7 +1299,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
     - *complexity-measurements-setup
     - in_format=StereoDmxEVS
     - out_format=mono
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
+    - ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
-- 
GitLab