From 6de07b642dc68909761ed1cc90f7356a98cba12d Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 19 Oct 2023 15:38:09 +0200 Subject: [PATCH 1/9] small cleanup --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b192cb4cb9..108ca9b43d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1269,9 +1269,7 @@ test-long-self-test: # --------------------------------------------------------------- .sanitizer-test-template: extends: - # TODO: still needed since MASA ltv vectors are not there yet - # when they were added, we can add a needs-ltv-dir template - - .test-job-linux-needs-testv-dir + - .test-job-linux stage: test tags: - sanitizer_test_main -- GitLab From 423318d77932e3c4be8a63b4a8d4cf5d74328548 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 19 Oct 2023 15:40:13 +0200 Subject: [PATCH 2/9] add test job for testing the delay --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 108ca9b43d..845a7a4249 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1702,6 +1702,16 @@ complexity-StereoDmxEVS-stereo-in-mono-out: # Other jobs # --------------------------------------------------------------- +test-delayed-job: + extends: + - test-job-linux + rules: + - if: $TEST_DELAYED_JOB + when: delayed + start_in: 26 hours + script: + - echo "finally..." + # job that sets up gitlab pages website pages: stage: deploy -- GitLab From e272d4e462d6911ccc4acdf2555e421de1fad84c Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 19 Oct 2023 15:42:01 +0200 Subject: [PATCH 3/9] fix job name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 845a7a4249..2e0327bd34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1704,7 +1704,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: test-delayed-job: extends: - - test-job-linux + - .test-job-linux rules: - if: $TEST_DELAYED_JOB when: delayed -- GitLab From fa228f4de19d0a7b05847b3304dece5751b12984 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 19 Oct 2023 15:45:16 +0200 Subject: [PATCH 4/9] Revert "fix job name" This reverts commit e272d4e462d6911ccc4acdf2555e421de1fad84c. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e0327bd34..845a7a4249 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1704,7 +1704,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: test-delayed-job: extends: - - .test-job-linux + - test-job-linux rules: - if: $TEST_DELAYED_JOB when: delayed -- GitLab From afdb2f07c380522ddcbd863300941ff95974abc4 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 19 Oct 2023 15:45:28 +0200 Subject: [PATCH 5/9] Revert "add test job for testing the delay" This reverts commit 423318d77932e3c4be8a63b4a8d4cf5d74328548. --- .gitlab-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 845a7a4249..108ca9b43d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1702,16 +1702,6 @@ complexity-StereoDmxEVS-stereo-in-mono-out: # Other jobs # --------------------------------------------------------------- -test-delayed-job: - extends: - - test-job-linux - rules: - - if: $TEST_DELAYED_JOB - when: delayed - start_in: 26 hours - script: - - echo "finally..." - # job that sets up gitlab pages website pages: stage: deploy -- GitLab From 85f3e014485513cf87b0934994f984e3e1137e12 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 13 Nov 2023 18:27:33 +0100 Subject: [PATCH 6/9] define new scheduled sanitizer jobs in gitlab-ci.yml --- .gitlab-ci.yml | 384 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 325 insertions(+), 59 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c5264805d..c6305c2624 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1295,7 +1295,7 @@ sanitizer-test-mono: extends: .sanitizer-test-schedule-A rules: - if: $SANITIZER_SCHEDULE_A - timeout: 2 hour + timeout: 1.25 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS @@ -1305,8 +1305,8 @@ sanitizer-test-stereo: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 2 hour - timeout: 2 hour + start_in: 1.25 hours + timeout: 2.5 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS @@ -1316,52 +1316,107 @@ sanitizer-test-stereodmxevs: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 4 hours - timeout: 2 hour + start_in: 3.75 hours + timeout: 1.25 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py StereoDmxEVS mono --tests $SANITIZER_TESTS -sanitizer-test-ism1: +sanitizer-test-mc-5_1: + extends: .sanitizer-test-schedule-A + rules: + - if: $SANITIZER_SCHEDULE_A + when: delayed + start_in: 5 hours + timeout: 2.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py 5_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-mc-5_1_2: + extends: .sanitizer-test-schedule-A + rules: + - if: $SANITIZER_SCHEDULE_A + when: delayed + start_in: 7.5 hours + timeout: 2.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-mc-5_1_4: + extends: .sanitizer-test-schedule-A + rules: + - if: $SANITIZER_SCHEDULE_A + when: delayed + start_in: 10 hours + timeout: 3.75 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-mc-7_1: + extends: .sanitizer-test-schedule-A + rules: + - if: $SANITIZER_SCHEDULE_A + when: delayed + start_in: 13.75 hours + timeout: 2.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-mc-7_1_4: extends: .sanitizer-test-schedule-A rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 6 hours - timeout: 2 hours + start_in: 16.25 hours + timeout: 5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-ism+1: + extends: .sanitizer-test-schedule-A + rules: + - if: $SANITIZER_SCHEDULE_A + when: delayed + start_in: 21.25 hours + timeout: 1.25 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS -sanitizer-test-ism2: +sanitizer-test-ism+2: extends: .sanitizer-test-schedule-A rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 8 hours - timeout: 3 hours + start_in: 22.5 hours + timeout: 2.5 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS -sanitizer-test-ism3: +sanitizer-test-ism+3: extends: .sanitizer-test-schedule-A rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 11 hours - timeout: 4 hour + start_in: 25 hours + timeout: 3.75 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS -sanitizer-test-ism4: +sanitizer-test-ism+4: extends: .sanitizer-test-schedule-A rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 15 hours - timeout: 6 hours + start_in: 28.75 hours + timeout: 5 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -1371,8 +1426,8 @@ sanitizer-test-masa: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 21 hours - timeout: 7 hours + start_in: 33.75 hours + timeout: 10 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -1382,128 +1437,339 @@ sanitizer-test-masa: .sanitizer-test-schedule-B: extends: - .sanitizer-test-template - timeout: 4 hours + timeout: 7.5 hours -sanitizer-test-mc-5_1: +sanitizer-test-foa: extends: .sanitizer-test-schedule-B rules: - if: $SANITIZER_SCHEDULE_B script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py 5_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py FOA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-mc-5_1_2: +sanitizer-test-hoa2: extends: .sanitizer-test-schedule-B rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 4 hours + start_in: 7.5 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py HOA2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-mc-5_1_4: +sanitizer-test-hoa3: extends: .sanitizer-test-schedule-B rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 8 hours + start_in: 15 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py HAO3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-mc-7_1: +sanitizer-test-osba-foa-ism1: extends: .sanitizer-test-schedule-B rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 12 hours + start_in: 22.5 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py FOA-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-mc-7_1_4: +sanitizer-test-osba-foa-ism2: extends: .sanitizer-test-schedule-B rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 16 hours + start_in: 30 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py FOA-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-foa-ism3: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 37.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py FOA-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-foa-ism4: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 45 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py FOA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-hoa2-ism1: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 52.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py HOA2-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-hoa2-ism2: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 60 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py HOA2-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-hoa2-ism3: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 67.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py HOA2-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-hoa2-ism4: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 75 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py HOA2-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-hoa3-ism1: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 82.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py HOA3-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-hoa3-ism2: + extends: .sanitizer-test-schedule-B + rules: + - if: $SANITIZER_SCHEDULE_B + when: delayed + start_in: 90 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py HOA3-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + ### --- sanitizer schedule C --- .sanitizer-test-schedule-C: extends: - .sanitizer-test-template - timeout: 6 hours + timeout: 10 hours -sanitizer-test-hoa3: +sanitizer-test-omasa-ism1: + extends: .sanitizer-test-schedule-C + rules: + - if: $SANITIZER_SCHEDULE_C + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py MASA-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-omasa-ism2: + extends: .sanitizer-test-schedule-C + rules: + - if: $SANITIZER_SCHEDULE_C + when: delayed + start_in: 10 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py MASA-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-omasa-ism3: + extends: .sanitizer-test-schedule-C + rules: + - if: $SANITIZER_SCHEDULE_C + when: delayed + start_in: 20 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py MASA-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-omasa-ism4: extends: .sanitizer-test-schedule-C rules: - if: $SANITIZER_SCHEDULE_C + when: delayed + start_in: 30 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py HOA3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py MASA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-planarhoa3: +sanitizer-test-osba-hoa3-ism3: extends: .sanitizer-test-schedule-C rules: - if: $SANITIZER_SCHEDULE_C when: delayed - start_in: 6 hours + start_in: 40 hours + timeout: 7.5 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py HOA3-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-hoa3-ism4: + extends: .sanitizer-test-schedule-C + rules: + - if: $SANITIZER_SCHEDULE_C + when: delayed + start_in: 47.5 hours + timeout: 7.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py HOA3-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS ### --- sanitizer schedule D --- .sanitizer-test-schedule-D: extends: - .sanitizer-test-template + timeout: 7.5 hours -sanitizer-test-ism+1: - extends: .sanitizer-test-schedule-D +sanitizer-test-planar-foa: + extends: .sanitizer-test-planar-schedule-D rules: - if: $SANITIZER_SCHEDULE_D - timeout: 2 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py ISM+1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-ism+2: - extends: .sanitizer-test-schedule-D +sanitizer-test-planar-hoa2: + extends: .sanitizer-test-planar-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed - start_in: 2 hours - timeout: 3 hours + start_in: 7.5 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py ISM+2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-ism+3: - extends: .sanitizer-test-schedule-D +sanitizer-test-planar-hoa3: + extends: .sanitizer-test-planar-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed - start_in: 5 hours - timeout: 4 hours + start_in: 15 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py ISM+3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py PlanarHAO3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -sanitizer-test-ism+4: - extends: .sanitizer-test-schedule-D +sanitizer-test-osba-planar-foa-ism1: + extends: .sanitizer-test-planar-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed - start_in: 9 hours - timeout: 6 hours + start_in: 22.5 hours script: - *update-ltv-repo - - python3 ci/run_scheduled_sanitizer_test.py ISM+4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS + - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-foa-ism2: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 30 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-foa-ism3: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 37.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-foa-ism4: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 45 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-hoa2-ism1: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 52.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-hoa2-ism2: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 60 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-hoa2-ism3: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 67.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-hoa2-ism4: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 75 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-hoa3-ism1: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 82.5 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA3-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + +sanitizer-test-osba-planar-hoa3-ism2: + extends: .sanitizer-test-planar-schedule-D + rules: + - if: $SANITIZER_SCHEDULE_D + when: delayed + start_in: 90 hours + script: + - *update-ltv-repo + - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA3-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS + # GCOV/LCOV coverage analysis of self_test suite coverage-test-on-main-scheduled: -- GitLab From 11f9ea9795319590966617b1530015c595e908e9 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 14 Nov 2023 09:07:20 +0100 Subject: [PATCH 7/9] adjust script for new modes --- ci/run_scheduled_sanitizer_test.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index 74b8d28807..ab3098d01f 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -49,6 +49,7 @@ EP_FILE = "ep_015.g192" GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {int(DURATION) * 50} {EP_FILE}" EIDXOR_CMD = "eid-xor -vbr -fer {bitstream} {ep_file} {out_file}" MC_MODES = ["5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"] +AMBISONICS_MODES = ["HOA3", "HOA2", "FOA", "PlanarHOA3", "PlanarHOA2", "PlanarFOA"] SCRIPT_DIR = pathlib.Path("./scripts").resolve() @@ -72,10 +73,22 @@ def main(args): def get_modes(in_format: str) -> list: + in_format_for_script = in_format + if in_format in MC_MODES: + in_format_for_script = "MC" + elif "-" in in_format: + # hyphen indicates combined format + scene_format, object_format = in_format.split('-') + if scene_format in AMBISONICS_MODES: + in_format_for_script = "OSBA" + else: + assert(scene_format == "MASA") + in_format_for_script = "OMASA" + cmd = [ SCRIPT_DIR.joinpath("runIvasCodec.py"), "-C", - "MC" if in_format in MC_MODES else in_format, + "MC" if in_format_for_script in MC_MODES else in_format_for_script, "-l", ] list_process = subprocess.run(cmd, capture_output=True) @@ -87,6 +100,9 @@ def get_modes(in_format: str) -> list: if in_format in MC_MODES: in_format = "MC_" + in_format + "_b" mode_list = [m for m in mode_list if in_format in m] + elif in_format_for_script != in_format: + # indicates combined format + mode_list = [m for m in mode_list if object_format in m and scene_format in m] return mode_list @@ -108,6 +124,9 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr modes = get_modes(in_format) md_file_command = get_md_file_command(in_format) + if len(modes) == 0: + return 0 + ### always run encoder and decoder with no frameloss cmd_no_fec = [ str(SCRIPT_DIR.joinpath("IvasBuildAndRunChecks.py")), -- GitLab From 2db101465ac307a8e2f085aaa0253df73e02a79d Mon Sep 17 00:00:00 2001 From: kiene Date: Tue, 14 Nov 2023 08:14:13 +0000 Subject: [PATCH 8/9] Fix template name which was changed by overeager regex --- .gitlab-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6305c2624..f9ea9542e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1643,7 +1643,7 @@ sanitizer-test-osba-hoa3-ism4: timeout: 7.5 hours sanitizer-test-planar-foa: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D script: @@ -1651,7 +1651,7 @@ sanitizer-test-planar-foa: - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-planar-hoa2: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1661,7 +1661,7 @@ sanitizer-test-planar-hoa2: - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-planar-hoa3: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1671,7 +1671,7 @@ sanitizer-test-planar-hoa3: - python3 ci/run_scheduled_sanitizer_test.py PlanarHAO3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-foa-ism1: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1681,7 +1681,7 @@ sanitizer-test-osba-planar-foa-ism1: - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-foa-ism2: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1691,7 +1691,7 @@ sanitizer-test-osba-planar-foa-ism2: - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-foa-ism3: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1701,7 +1701,7 @@ sanitizer-test-osba-planar-foa-ism3: - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-foa-ism4: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1711,7 +1711,7 @@ sanitizer-test-osba-planar-foa-ism4: - python3 ci/run_scheduled_sanitizer_test.py PlanarFOA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-hoa2-ism1: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1721,7 +1721,7 @@ sanitizer-test-osba-planar-hoa2-ism1: - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-hoa2-ism2: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1731,7 +1731,7 @@ sanitizer-test-osba-planar-hoa2-ism2: - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-hoa2-ism3: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1741,7 +1741,7 @@ sanitizer-test-osba-planar-hoa2-ism3: - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-hoa2-ism4: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1751,7 +1751,7 @@ sanitizer-test-osba-planar-hoa2-ism4: - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA2-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-hoa3-ism1: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed @@ -1761,7 +1761,7 @@ sanitizer-test-osba-planar-hoa3-ism1: - python3 ci/run_scheduled_sanitizer_test.py PlanarHOA3-ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-osba-planar-hoa3-ism2: - extends: .sanitizer-test-planar-schedule-D + extends: .sanitizer-test-schedule-D rules: - if: $SANITIZER_SCHEDULE_D when: delayed -- GitLab From bb0f4269effcb502eefd5f26c08f11f5333b3c54 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 14 Nov 2023 09:54:12 +0100 Subject: [PATCH 9/9] fix bug with MC modes --- ci/run_scheduled_sanitizer_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index ab3098d01f..661df093d1 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -88,7 +88,7 @@ def get_modes(in_format: str) -> list: cmd = [ SCRIPT_DIR.joinpath("runIvasCodec.py"), "-C", - "MC" if in_format_for_script in MC_MODES else in_format_for_script, + in_format_for_script, "-l", ] list_process = subprocess.run(cmd, capture_output=True) -- GitLab