diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d5c431553f0b4001862b81a62aa17a6d633c02a..15cb7a656978a37059e6cfb8d115ca7da909f2dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2297,16 +2297,16 @@ complexity-stereo-in-ext-out: - *complexity-measurements-prepare-artifacts - exit $ret_val -complexity-ism-in-binaural_room_ir-out: +complexity-ism-in-binaural_room_reverb-out: extends: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 1 hour + when: delayed + start_in: 1 hour script: - in_format=ISM - - out_format=BINAURAL_ROOM_IR + - out_format=BINAURAL_ROOM_REVERB - ret_val=0 - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts @@ -2317,8 +2317,8 @@ complexity-ism-in-ext-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 2 hour + when: delayed + start_in: 3 hour script: - in_format=ISM - out_format=EXT @@ -2332,8 +2332,8 @@ complexity-sba-hoa3-in-ext-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 3 hours + when: delayed + start_in: 4 hours script: - in_format=HOA3 - out_format=EXT @@ -2347,8 +2347,8 @@ complexity-sba-hoa3-in-binaural_room_ir-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 4 hours + when: delayed + start_in: 5 hours script: - in_format=HOA3 - out_format=BINAURAL_ROOM_IR @@ -2362,8 +2362,8 @@ complexity-mc-in-ext-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 5 hours + when: delayed + start_in: 6 hours script: - in_format=MC - out_format=EXT @@ -2377,8 +2377,8 @@ complexity-mc-in-binaural_room_ir-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 6 hours + when: delayed + start_in: 7 hours script: - in_format=MC - out_format=BINAURAL_ROOM_IR @@ -2392,8 +2392,8 @@ complexity-masa-in-ext-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 7 hours + when: delayed + start_in: 8 hours script: - in_format=MASA - out_format=EXT @@ -2407,8 +2407,8 @@ complexity-masa-in-binaural-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 8 hours + when: delayed + start_in: 9 hours script: - in_format=MASA - out_format=BINAURAL @@ -2417,13 +2417,28 @@ complexity-masa-in-binaural-out: - *complexity-measurements-prepare-artifacts - exit $ret_val +complexity-masa-in-hoa3-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + when: delayed + start_in: 10 hours + script: + - in_format=MASA + - out_format=HOA3 + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + complexity-omasa-in-ext-out: extends: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 9 hours + when: delayed + start_in: 11 hours script: - in_format=OMASA - out_format=EXT @@ -2437,8 +2452,8 @@ complexity-omasa-in-binaural-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 10 hours + when: delayed + start_in: 12 hours script: - in_format=OMASA - out_format=BINAURAL @@ -2452,8 +2467,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out: - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed - # start_in: 11 hours + when: delayed + start_in: 13 hours script: - in_format=StereoDmxEVS - out_format=mono @@ -2462,6 +2477,36 @@ complexity-StereoDmxEVS-stereo-in-mono-out: - *complexity-measurements-prepare-artifacts - exit $ret_val +complexity-osba-in-ext-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + when: delayed + start_in: 14 hours + script: + - in_format=OSBA + - out_format=EXT + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-osba-in-binaural_room_ir-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + when: delayed + start_in: 15 hours + script: + - in_format=OSBA + - out_format=BINAURAL_ROOM_IR + - ret_val=0 + - 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/setup_pages.py b/ci/setup_pages.py index 42767051db0cef68babfb86498e8689af4157877..1ae20c104352b716f4b5df9606ae5a801180f37a 100755 --- a/ci/setup_pages.py +++ b/ci/setup_pages.py @@ -11,17 +11,17 @@ from get_id_of_last_job_occurence import get_job_id PROJECT_ID_FLOAT_REPO = 49 PROJECT_ID_BASOP_REPO = 77 -# job names -> hyperlink strings forthe landing page +# job names -> hyperlink strings for the landing page JOBS_FLOAT_REPO = { # old ones no longer running -> replaced by "ext" jobs, remove after some time - "complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out", - "complexity-ism-in-binaural-out": "[OLD] ISM in, BINAURAL out", - "complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out", - "complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out", - "complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out", + # "complexity-stereo-in-stereo-out": "[OLD] Stereo in, stereo out", + # "complexity-sba-hoa3-in-hoa3-out": "[OLD] HOA3 in, HOA3 out", + # "complexity-mc-in-7_1_4-out": "[OLD] MC in, 7_1_4 out", + # "complexity-masa-in-7_1_4-out": "[OLD] Masa in, 7_1_4 out", # current ones "complexity-stereo-in-ext-out": "Stereo in, EXT out", - "complexity-ism-in-binaural_room_ir-out": "ISM in, BINAURAL_ROOM_IR out", + "complexity-ism-in-binaural_room_reverb-out": "ISM in, BINAURAL_ROOM_REVERB out", + "complexity-ism-in-binaural-out": "ISM in, BINAURAL out", "complexity-ism-in-ext-out": "ISM in, EXT out", "complexity-sba-hoa3-in-ext-out": "HOA3 in, EXT out", "complexity-sba-hoa3-in-binaural_room_ir-out": "HOA3 in, BINAURAL_ROOM_IR out", @@ -29,10 +29,13 @@ JOBS_FLOAT_REPO = { "complexity-mc-in-binaural_room_ir-out": "MC in, BINAURAL_ROOM_IR out", "complexity-masa-in-ext-out": "MASA in, EXT out", "complexity-masa-in-binaural-out": "MASA in, BINAURAL out", + "complexity-masa-in-hoa3-out": "MASA in, HOA3 out", "complexity-omasa-in-ext-out": "OMASA in, EXT out", "complexity-omasa-in-binaural-out": "OMASA in, BINAURAL out", - # "timeless" jobs (survivors from the old jobs or not complexity) + "complexity-osba-in-ext-out": "OSBA in, EXT out", + "complexity-osba-in-binaural_room_ir-out": "OSBA in, BINAURAL_ROOM_IR out", "complexity-StereoDmxEVS-stereo-in-mono-out": "StereoDmxEVS, Stereo in, Mono out", + # "timeless" jobs (not complexity) "coverage-test-on-main-scheduled": "Coverage", } JOBS_BASOP_REPO = [ @@ -79,6 +82,7 @@ def create_landing_page_float_repo(jobs, index_html): # dynamically create the complexity links on the landing page link_html = list() link_html = ["