From dd0b7f78abe4c9f38f4e0ba60b0729f375fa71b9 Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 4 Mar 2024 11:46:50 +0100
Subject: [PATCH 01/17] add saturation smoke test

---
 .gitlab-ci.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 355d85505..2f02f0a9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ variables:
       - 'default'
       - 'pytest-mld'
       - 'pytest-mld-long'
+      - 'pytest-smoke-test'
       - 'evs-26444'
       - 'sanitizer-stv'
 
@@ -48,6 +49,9 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-mld-long'
       variables:
         IVAS_PIPELINE_NAME: 'Run MLD tool against float ref (long test vectors): $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-smoke-test'
+      variables:
+        IVAS_PIPELINE_NAME: 'Run smoke-test: $CI_COMMIT_BRANCH'
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'
       variables:
         IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'
@@ -155,6 +159,15 @@ stages:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: never
 
+.rules-pytest-smoke-test:
+  rules:
+    - if: $PYTEST_SMOKE_TEST # Set by scheduled pipeline
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-smoke-test"
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: never
+
 # ---------------------------------------------------------------
 # Job templates
 # ---------------------------------------------------------------
@@ -458,6 +471,46 @@ ivas-pytest-mld-long-dec-lev+10:
     - LEVEL_SCALING=3.162
   <<: *ivas-pytest-mld-anchor
 
+ivas-pytest-saturation-smoke-test:
+  extends:
+    - .rules-pytest-smoke-test
+    - .test-job-linux
+  script:
+    - USE_LTV=1
+    - LEVEL_SCALING=32768
+
+    - *print-common-info
+    - *update-scripts-repo
+    - if [ $USE_LTV -eq 1 ]; then
+    -    *update-ltv-repo
+    -    *copy-ltv-files-to-testv-dir
+    - fi
+    - *remove-unsupported-testcases
+    - if [ $LEVEL_SCALING != "1.0" ];then
+    -   *apply-testv-scaling
+    - fi
+    - *mld-test-setup-codec
+
+    - bash ci/smoke_test.sh
+    ### analyze for failures
+    - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_plc.txt ] || ! [ -s smoke_test_output_jbm_noEXT.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
+    - ret_val=0
+    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; ret_val=1; fi
+    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; ret_val=1; fi
+    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; ret_val=1; fi
+    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
+    - exit $ret_val
+  artifacts:
+    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    expire_in: 1 week
+    when: always
+    paths:
+      - smoke_test_output.txt
+      - smoke_test_output_plc.txt
+      - smoke_test_output_jbm_noEXT.txt
+      - smoke_test_output_hrtf.txt
+    expose_as: "saturation smoke test results"
+
 # ---------------------------------------------------------------
 # EVS 26.444 test job
 # ---------------------------------------------------------------
-- 
GitLab


From 023e224273fbfcdf9f6bc7c7b423ae90b34cc725 Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 4 Mar 2024 12:35:13 +0100
Subject: [PATCH 02/17] temporarily set scaling to 1.0 for smoke test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f02f0a9a..0b9569be0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -477,7 +477,7 @@ ivas-pytest-saturation-smoke-test:
     - .test-job-linux
   script:
     - USE_LTV=1
-    - LEVEL_SCALING=32768
+    - LEVEL_SCALING=1.0
 
     - *print-common-info
     - *update-scripts-repo
-- 
GitLab


From d8e4cd4c3c55ea1886eacdc18f467a202389621b Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 4 Mar 2024 13:51:01 +0100
Subject: [PATCH 03/17] remove 'mld-test-setup-codec' from
 'ivas-smoke-test-saturation'

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b9569be0..c7dfeb0e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -471,7 +471,7 @@ ivas-pytest-mld-long-dec-lev+10:
     - LEVEL_SCALING=3.162
   <<: *ivas-pytest-mld-anchor
 
-ivas-pytest-saturation-smoke-test:
+ivas-smoke-test-saturation:
   extends:
     - .rules-pytest-smoke-test
     - .test-job-linux
@@ -489,7 +489,6 @@ ivas-pytest-saturation-smoke-test:
     - if [ $LEVEL_SCALING != "1.0" ];then
     -   *apply-testv-scaling
     - fi
-    - *mld-test-setup-codec
 
     - bash ci/smoke_test.sh
     ### analyze for failures
-- 
GitLab


From 75c88e2ab295109ecc13fd423573494c7a7dad9f Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 4 Mar 2024 14:24:27 +0100
Subject: [PATCH 04/17] skip prepare_mem_dryrun.py script in smoke_test.sh

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7dfeb0e6..0517715de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -490,6 +490,9 @@ ivas-smoke-test-saturation:
     -   *apply-testv-scaling
     - fi
 
+    # skip prepare_mem_dryrun.py script in smoke_test.sh
+    - sed -i 's/python3 .\/scripts\/prepare_mem_dryrun.py/#python3 .\/scripts\/prepare_mem_dryrun.py/g' ci/smoke_test.sh
+
     - bash ci/smoke_test.sh
     ### analyze for failures
     - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_plc.txt ] || ! [ -s smoke_test_output_jbm_noEXT.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
-- 
GitLab


From cce6bd2a7a41d4ab5fe9c6aff74b49a097fde03b Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 4 Mar 2024 15:04:48 +0100
Subject: [PATCH 05/17] add test-job-linux-needs-testv-dir before
 ivas-smoke-test-saturation

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0517715de..b7eee94d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -474,7 +474,7 @@ ivas-pytest-mld-long-dec-lev+10:
 ivas-smoke-test-saturation:
   extends:
     - .rules-pytest-smoke-test
-    - .test-job-linux
+    - .test-job-linux-needs-testv-dir
   script:
     - USE_LTV=1
     - LEVEL_SCALING=1.0
-- 
GitLab


From b9c3a25e77a315266d5ec13587c6652e7f1973ec Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 4 Mar 2024 15:08:09 +0100
Subject: [PATCH 06/17] define TESTV_DIR

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7eee94d8..5ab20a95e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 variables:
+  TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
   EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
   REFERENCE_TAG: "20231128_Update_Ittiam"
-- 
GitLab


From ea640739dd3b574e41e6fd07fbc6041f42c2b711 Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 4 Mar 2024 15:12:22 +0100
Subject: [PATCH 07/17] update scripts repo before copying test vectors

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ab20a95e..d3d55e2bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -189,6 +189,7 @@ stages:
 .test-job-linux-needs-testv-dir:
   extends: .test-job-linux
   before_script:
+    - *update-scripts-repo
     - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi
     - cp -r scripts/testv/* $TESTV_DIR/
 
-- 
GitLab


From 93702141fc5f6a7394385b68d110a27e4076da44 Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Thu, 7 Mar 2024 11:26:49 +0100
Subject: [PATCH 08/17] fix bug commited with auto-merge

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee451e234..15ce8f8ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -483,7 +483,6 @@ ivas-smoke-test-saturation:
     -    *update-ltv-repo
     -    *copy-ltv-files-to-testv-dir
     - fi
-    - *remove-unsupported-testcases
     - if [ $LEVEL_SCALING != "1.0" ];then
     -   *apply-testv-scaling
     - fi
-- 
GitLab


From a85fdd2b75476e02e13f0ab710fd230352b4087d Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Thu, 7 Mar 2024 11:28:26 +0100
Subject: [PATCH 09/17] Revert "temporarily set scaling to 1.0 for smoke test"

This reverts commit 023e224273fbfcdf9f6bc7c7b423ae90b34cc725.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15ce8f8ee..2a6312834 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -475,7 +475,7 @@ ivas-smoke-test-saturation:
     - .test-job-linux-needs-testv-dir
   script:
     - USE_LTV=1
-    - LEVEL_SCALING=1.0
+    - LEVEL_SCALING=32768
 
     - *print-common-info
     - *update-scripts-repo
-- 
GitLab


From 3ac3f7dd85f8164d34c4d3b0e36900296d27798e Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Thu, 7 Mar 2024 12:04:12 +0100
Subject: [PATCH 10/17] copy scaled files to TEST_DIR

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a6312834..a2b917426 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -472,7 +472,6 @@ ivas-pytest-mld-long-dec-lev+10:
 ivas-smoke-test-saturation:
   extends:
     - .rules-pytest-smoke-test
-    - .test-job-linux-needs-testv-dir
   script:
     - USE_LTV=1
     - LEVEL_SCALING=32768
@@ -486,6 +485,7 @@ ivas-smoke-test-saturation:
     - if [ $LEVEL_SCALING != "1.0" ];then
     -   *apply-testv-scaling
     - fi
+    - cp -r scripts/testv/* $TESTV_DIR/
 
     # skip prepare_mem_dryrun.py script in smoke_test.sh
     - sed -i 's/python3 .\/scripts\/prepare_mem_dryrun.py/#python3 .\/scripts\/prepare_mem_dryrun.py/g' ci/smoke_test.sh
-- 
GitLab


From e08190a9f76930849e64885e56e242f6ce7bcce8 Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Thu, 7 Mar 2024 12:07:39 +0100
Subject: [PATCH 11/17] add back test-job-linux-needs-testv-dir

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2b917426..b8ce0c53d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -472,6 +472,7 @@ ivas-pytest-mld-long-dec-lev+10:
 ivas-smoke-test-saturation:
   extends:
     - .rules-pytest-smoke-test
+    - .test-job-linux-needs-testv-dir
   script:
     - USE_LTV=1
     - LEVEL_SCALING=32768
-- 
GitLab


From 97c956ef36b704098c69b348c0cea2ef253b1be0 Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Thu, 7 Mar 2024 13:13:06 +0100
Subject: [PATCH 12/17] test with scaling set to 1 to see if job fails

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8ce0c53d..4e9e27bd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -475,7 +475,7 @@ ivas-smoke-test-saturation:
     - .test-job-linux-needs-testv-dir
   script:
     - USE_LTV=1
-    - LEVEL_SCALING=32768
+    #- LEVEL_SCALING=32768
 
     - *print-common-info
     - *update-scripts-repo
@@ -495,10 +495,10 @@ ivas-smoke-test-saturation:
     ### analyze for failures
     - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_plc.txt ] || ! [ -s smoke_test_output_jbm_noEXT.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
     - ret_val=0
-    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; ret_val=1; fi
-    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; ret_val=1; fi
-    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; ret_val=1; fi
-    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
+    - if cat smoke_test_output.txt | grep -c "passed"; then echo "Smoke test without PLC passed"; ret_val=1; fi
+    - if cat smoke_test_output_plc.txt | grep -c "passed"; then echo "Smoke test with PLC passed"; ret_val=1; fi
+    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "passed"; then echo "Smoke test JBM part passed"; ret_val=1; fi
+    - if cat smoke_test_output_hrtf.txt | grep -c "passed"; then echo "Smoke test with external hrtf files passed"; ret_val=1; fi
     - exit $ret_val
   artifacts:
     name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
-- 
GitLab


From 3978acab32a7e25ce3d408e1646b694e58067cad Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Thu, 7 Mar 2024 13:58:53 +0100
Subject: [PATCH 13/17] test with LEVEL_SCALING=32768

---
 .gitlab-ci.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e9e27bd9..17483df7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -475,7 +475,7 @@ ivas-smoke-test-saturation:
     - .test-job-linux-needs-testv-dir
   script:
     - USE_LTV=1
-    #- LEVEL_SCALING=32768
+    - LEVEL_SCALING=32768
 
     - *print-common-info
     - *update-scripts-repo
@@ -494,12 +494,15 @@ ivas-smoke-test-saturation:
     - bash ci/smoke_test.sh
     ### analyze for failures
     - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_plc.txt ] || ! [ -s smoke_test_output_jbm_noEXT.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
-    - ret_val=0
-    - if cat smoke_test_output.txt | grep -c "passed"; then echo "Smoke test without PLC passed"; ret_val=1; fi
-    - if cat smoke_test_output_plc.txt | grep -c "passed"; then echo "Smoke test with PLC passed"; ret_val=1; fi
-    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "passed"; then echo "Smoke test JBM part passed"; ret_val=1; fi
-    - if cat smoke_test_output_hrtf.txt | grep -c "passed"; then echo "Smoke test with external hrtf files passed"; ret_val=1; fi
-    - exit $ret_val
+    - ret_val=1
+    - ret_val2=1
+    - ret_val3=1
+    - ret_val4=1
+    - if cat smoke_test_output.txt | grep -c "failed" ; then echo "Smoke test without PLC failed"; ret_val=0; fi
+    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; ret_val2=0; fi
+    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; ret_val3=0; fi
+    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val4=0; fi
+    - if [ $ret_val == 1 ] || [ $ret_val2 == 1 ] || [ $ret_val3 == 1 ] || [ $ret_val4 == 1 ]; then exit 1; else exit 0; fi
   artifacts:
     name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
     expire_in: 1 week
-- 
GitLab


From 854ca129e97030677804f79f78751588b76d87e3 Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 11 Mar 2024 14:35:21 +0100
Subject: [PATCH 14/17] change pipeline type name to
 pytest-saturation-smoke-test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17483df7a..36de2276d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
       - 'default'
       - 'pytest-mld'
       - 'pytest-mld-long'
-      - 'pytest-smoke-test'
+      - 'pytest-saturation-smoke-test'
       - 'evs-26444'
       - 'sanitizer-stv'
 
@@ -51,9 +51,9 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-mld-long'
       variables:
         IVAS_PIPELINE_NAME: 'Run MLD tool against float ref (long test vectors): $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-smoke-test'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-saturation-smoke-test'
       variables:
-        IVAS_PIPELINE_NAME: 'Run smoke-test: $CI_COMMIT_BRANCH'
+        IVAS_PIPELINE_NAME: 'Run saturation smoke-test: $CI_COMMIT_BRANCH'
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'
       variables:
         IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'
-- 
GitLab


From 75f156cf90f8ef923f7c4ae0de5050457619eb59 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 11 Mar 2024 13:57:28 +0000
Subject: [PATCH 15/17] Correct pytest-saturation-smoke-test in rules

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06ad28923..6c894dfaf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,10 +158,10 @@ stages:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: never
 
-.rules-pytest-smoke-test:
+.rules-pytest-saturation-smoke-test:
   rules:
     - if: $PYTEST_SMOKE_TEST # Set by scheduled pipeline
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-smoke-test"
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-saturation-smoke-test"
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
@@ -473,7 +473,7 @@ ivas-pytest-mld-long-dec-lev+10:
 
 ivas-smoke-test-saturation:
   extends:
-    - .rules-pytest-smoke-test
+    - .rules-pytest-saturation-smoke-test
     - .test-job-linux-needs-testv-dir
   script:
     - USE_LTV=1
-- 
GitLab


From caef7152f3ab74879b75c283435ae26911233f88 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 11 Mar 2024 14:53:48 +0000
Subject: [PATCH 16/17] Fix logic in overall result for saturation smoke test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c894dfaf..92b227b24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -496,15 +496,12 @@ ivas-smoke-test-saturation:
     - bash ci/smoke_test.sh
     ### analyze for failures
     - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_plc.txt ] || ! [ -s smoke_test_output_jbm_noEXT.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
-    - ret_val=1
-    - ret_val2=1
-    - ret_val3=1
-    - ret_val4=1
-    - if cat smoke_test_output.txt | grep -c "failed" ; then echo "Smoke test without PLC failed"; ret_val=0; fi
-    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; ret_val2=0; fi
-    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; ret_val3=0; fi
-    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val4=0; fi
-    - if [ $ret_val == 1 ] || [ $ret_val2 == 1 ] || [ $ret_val3 == 1 ] || [ $ret_val4 == 1 ]; then exit 1; else exit 0; fi
+    - ret_val=0
+    - if cat smoke_test_output.txt | grep -c "failed" ; then echo "Smoke test without PLC failed"; ret_val=1; fi
+    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; ret_val=1; fi
+    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; ret_val=1; fi
+    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
+    - exit $ret_val
   artifacts:
     name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
     expire_in: 1 week
-- 
GitLab


From 8da69713c3e2ee8a029c1d4e9131cbead698c35c Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 11 Mar 2024 15:23:19 +0000
Subject: [PATCH 17/17] Minor correction on names on artifacts

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92b227b24..6a49643a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,7 +230,7 @@ stages:
     exit_codes:
       - 123
   artifacts:
-    name: "mld--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "mld--sha-$CI_COMMIT_SHORT_SHA--results"
     expire_in: 1 week
     when: always
     paths:
@@ -503,7 +503,7 @@ ivas-smoke-test-saturation:
     - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
     - exit $ret_val
   artifacts:
-    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "ivas-smoke-test-saturation--sha-$CI_COMMIT_SHORT_SHA--results"
     expire_in: 1 week
     when: always
     paths:
@@ -542,7 +542,7 @@ be-2-evs-26444:
     - exit 0
     
   artifacts:
-    name: "evs-26444--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "evs-26444--sha-$CI_COMMIT_SHORT_SHA--results"
     expire_in: 1 week
     when: always
     paths:
-- 
GitLab