From 6dbb921e1d8c6549390a24000863c50861bfcef3 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 30 May 2024 08:55:50 +0000 Subject: [PATCH 01/10] Update self_test.prm: use short test-vector instead of a long one --- scripts/config/self_test.prm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 301a80dfe3..3a071276cb 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -293,8 +293,8 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 //../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit -//../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_EXT.tst +//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit +//../IVAS_dec EXT 48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out -- GitLab From 4ff56f7fb56986985a9097e40cf0a9371e5376c4 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 30 May 2024 09:00:45 +0000 Subject: [PATCH 02/10] Update self_test.prm: activate conditions --- scripts/config/self_test.prm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 3a071276cb..0c6bd4e401 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -289,12 +289,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec STEREO 32 bit testv/stvST32c.wav_stereo_sw_32-32.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, MONO out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit -//../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit +../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit -//../IVAS_dec EXT 48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_EXT.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit +../IVAS_dec EXT 48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out -- GitLab From 4df6c008b1bf48d542674d2982c13fdc56c1751d Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 30 May 2024 09:02:10 +0000 Subject: [PATCH 03/10] Update self_test_ltv.prm --- scripts/config/self_test_ltv.prm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index 2a66699563..f4093ce819 100644 --- a/scripts/config/self_test_ltv.prm +++ b/scripts/config/self_test_ltv.prm @@ -288,12 +288,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_sw_32-32.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, MONO out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit -//../IVAS_dec MONO 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_MONO.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit +../IVAS_dec MONO 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_MONO.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out -//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit -//../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_EXT.tst +../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit +../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out -- GitLab From 89c50def3cf7146e812eecb9ca1dfed8d3e0c7ae Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 30 May 2024 12:39:38 +0200 Subject: [PATCH 04/10] revert activation of disabled conditions --- scripts/config/self_test.prm | 8 ++++---- scripts/config/self_test_ltv.prm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 0c6bd4e401..3a071276cb 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -289,12 +289,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec STEREO 32 bit testv/stvST32c.wav_stereo_sw_32-32.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, MONO out -../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit -../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst +//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48n.wav bit +//../IVAS_dec MONO 48 bit testv/stvST48n.wav_stereo_sw_48-48_DTX_MONO.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out -../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit -../IVAS_dec EXT 48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_EXT.tst +//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/stvST48c.wav bit +//../IVAS_dec EXT 48 bit testv/stvST48c.wav_stereo_sw_48-48_DTX_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out diff --git a/scripts/config/self_test_ltv.prm b/scripts/config/self_test_ltv.prm index f4093ce819..2a66699563 100644 --- a/scripts/config/self_test_ltv.prm +++ b/scripts/config/self_test_ltv.prm @@ -288,12 +288,12 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_dec STEREO 32 bit testv/ltv32_STEREO.wav_stereo_sw_32-32.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, MONO out -../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit -../IVAS_dec MONO 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_MONO.tst +//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit +//../IVAS_dec MONO 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_MONO.tst // stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out -../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit -../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_EXT.tst +//../IVAS_cod -dtx -stereo ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 48 testv/ltv48_STEREO.wav bit +//../IVAS_dec EXT 48 bit testv/ltv48_STEREO.wav_stereo_sw_48-48_DTX_EXT.tst // 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, EXT out -- GitLab From 223d99b5d543b7e12396eb1beb1f744774a14c5f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:48:45 +0200 Subject: [PATCH 05/10] correct variable setting --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7d544e783..a3e86272ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ variables: OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4" OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3" OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" - OUT_FORMATS_ALL: "$OUT_FORMATS_ALL" + OUT_FORMATS_ALL: "$OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT" IVAS_PIPELINE_NAME: '' MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec." -- GitLab From 1bf5d61a3e6646efbca116c7a6d3835c97568af3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:52:28 +0200 Subject: [PATCH 06/10] add temporary job for checking variable setting --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3e86272ea..411df0cabe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -379,6 +379,16 @@ uninterruptible: # Validation jobs # --------------------------------------------------------------- +print-variables: + extends: + - .rules-merge-request + stage: prevalidate + needs: [] + tags: + - ivas-linux + script: + - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" + branch-is-up-to-date-with-main-pre: extends: - .rules-merge-request -- GitLab From f412c6617bb94c316a55a4713b90fa8a827c4c51 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:54:50 +0200 Subject: [PATCH 07/10] avoid colon in yaml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 411df0cabe..44484d80dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -387,7 +387,7 @@ print-variables: tags: - ivas-linux script: - - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" + - echo "OUT_FORMATS_ALL - $OUT_FORMATS_ALL" branch-is-up-to-date-with-main-pre: extends: -- GitLab From ba16f102f666f4bc1fb2b1a0a9ac251259fd4ff1 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:55:51 +0200 Subject: [PATCH 08/10] Revert "avoid colon in yaml file" This reverts commit f412c6617bb94c316a55a4713b90fa8a827c4c51. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44484d80dc..411df0cabe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -387,7 +387,7 @@ print-variables: tags: - ivas-linux script: - - echo "OUT_FORMATS_ALL - $OUT_FORMATS_ALL" + - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" branch-is-up-to-date-with-main-pre: extends: -- GitLab From 9c44ca319fd8c3ecc15c2a6a2fae90e08cef4660 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 09:55:58 +0200 Subject: [PATCH 09/10] Revert "add temporary job for checking variable setting" This reverts commit 1bf5d61a3e6646efbca116c7a6d3835c97568af3. --- .gitlab-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 411df0cabe..a3e86272ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -379,16 +379,6 @@ uninterruptible: # Validation jobs # --------------------------------------------------------------- -print-variables: - extends: - - .rules-merge-request - stage: prevalidate - needs: [] - tags: - - ivas-linux - script: - - echo "OUT_FORMATS_ALL: $OUT_FORMATS_ALL" - branch-is-up-to-date-with-main-pre: extends: - .rules-merge-request -- GitLab From 49b22a266b80405cd9f2788786e0ed8798e5303b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 3 Jun 2024 11:10:11 +0200 Subject: [PATCH 10/10] use scope to only get success or failed jobs --- ci/get_id_of_last_job_occurence.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ci/get_id_of_last_job_occurence.py b/ci/get_id_of_last_job_occurence.py index 50beac5bb7..389c6ab734 100755 --- a/ci/get_id_of_last_job_occurence.py +++ b/ci/get_id_of_last_job_occurence.py @@ -38,6 +38,8 @@ import requests PER_PAGE_SUFFIX = "?per_page=50" PAGE_SUFFIX = "&page={}" API_URL_TMPL = "https://forge.3gpp.org/rep/api/v4/projects/{}/pipelines" +SCOPE_FAILED = "scope[]=failed" +SCOPE_SUCCESS = "scope[]=success" def get_job_id(branch_name, job_name, project_id, success_only): @@ -51,7 +53,11 @@ def get_job_id(branch_name, job_name, project_id, success_only): resp_pls = requests.get(url_pls + suffix) for pl in resp_pls.json(): if pl["ref"] == branch_name: - url_jobs = url_pls + f"/{pl['id']}/jobs" + scope = f"?{SCOPE_SUCCESS}" + if not success_only: + scope += f"&{SCOPE_FAILED}" + + url_jobs = url_pls + f"/{pl['id']}/jobs{scope}" # only one of the suffixes here - this assumes only max of 50 jobs per pipeline # so only one page needed @@ -62,8 +68,7 @@ def get_job_id(branch_name, job_name, project_id, success_only): # find actual job by name for job in resp_jobs.json(): - include_job = not success_only or job["status"] == "success" - if include_job and job["name"] == job_name: + if job["name"] == job_name: job_id = job["id"] break if job_id >= 0: -- GitLab