diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7d544e78313c37b02575602c0edfa006fffcf69..a3e86272ea94f23f97a1a9902f37b581c53bde00 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." diff --git a/ci/get_id_of_last_job_occurence.py b/ci/get_id_of_last_job_occurence.py index 50beac5bb7c96d9b657604fb562e870bade65d68..389c6ab7346387fd5397ec080b46b7c0c355518d 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: diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 301a80dfe3552ad54c91785737b5b3fa436f5fca..3a071276cbaed462f5697410817246db13dc01d6 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