From 46d03e6a3bfc9f6326858cc315e14b5160811d12 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 26 Sep 2022 10:27:23 +0200 Subject: [PATCH 1/2] use template for sanitizer tests consistently and archive ep file --- .gitlab-ci.yml | 53 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 40 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93fe2a758b..6eaa76e627 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -492,6 +492,11 @@ codec-comparison-on-main-push: stage: test tags: - sanitizer_test_main + artifacts: + name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SBA" + when: always + paths: + - ep_015.g192 sanitizer-test-mono: extends: .sanitizer-test-template @@ -555,11 +560,7 @@ sanitizer-test-ism4: - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS sanitizer-test-mc-5_1: - extends: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed @@ -568,11 +569,7 @@ sanitizer-test-mc-5_1: - 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: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed @@ -581,11 +578,7 @@ sanitizer-test-mc-5_1_2: - 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: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed @@ -594,11 +587,7 @@ sanitizer-test-mc-5_1_4: - 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: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed @@ -607,11 +596,7 @@ sanitizer-test-mc-7_1: - 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: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed @@ -620,11 +605,7 @@ sanitizer-test-mc-7_1_4: - 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-masa: - extends: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed @@ -633,11 +614,7 @@ sanitizer-test-masa: - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS sanitizer-test-sba: - extends: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed @@ -646,11 +623,7 @@ sanitizer-test-sba: - python3 ci/run_scheduled_sanitizer_test.py SBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS sanitizer-test-planarsba: - extends: - - .test-job-linux-needs-testv-dir - stage: test - tags: - - sanitizer_test_main + extends: .sanitizer-test-template rules: - if: $IS_SANITIZER_TEST_RUN when: delayed -- GitLab From fbe976df314d65a738edd3916bbfd15a00184b0c Mon Sep 17 00:00:00 2001 From: kiene Date: Mon, 26 Sep 2022 09:39:44 +0000 Subject: [PATCH 2/2] fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6eaa76e627..cbd61ad2dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -493,7 +493,7 @@ codec-comparison-on-main-push: tags: - sanitizer_test_main artifacts: - name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SBA" + name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA" when: always paths: - ep_015.g192 -- GitLab