From 8de65d3908213f18ef0fd28a4aea472a79531925 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 17:28:36 +0200 Subject: [PATCH 01/21] add selection experiment job --- .gitlab-ci.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24a5e46d9f..6bb8ef5444 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -685,6 +685,35 @@ clang-format-check: name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart" expose_as: "logs-sidstart" +selection-test-processing: + extends: + - .test-job-linux-needs-testv-dir + - .rules-merge-request + tags: + - processing-scripts-linux + stage: test + needs: ["build-codec-linux-make"] + script: + # get processing script code + # TODO: use main branch + - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b 50-change-loudness-warning-to-error + - mkdir -p ivas-processing-scripts/tests/data/testv + - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/ + + # build codec and put into bin dir + - make -j + - cp ./IVAS_* ivas-processing-scripts/ivas_processing_scripts/bin/ + + # run experiments test + - cd ivas-processing-scripts + - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt + artifacts: + paths: + - ivas-processing-scripts/experiments/selection/*/proc_output/*.log + - log.txt + when: on_failure + expire_in: 1 week + # --------------------------------------------------------------- # Test jobs for main branch # --------------------------------------------------------------- -- GitLab From e6a26a08e2a80bc672b29d910e64b423dd68f51e Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 18:10:37 +0200 Subject: [PATCH 02/21] run on single runner for now --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bb8ef5444..283f97e47b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -690,7 +690,7 @@ selection-test-processing: - .test-job-linux-needs-testv-dir - .rules-merge-request tags: - - processing-scripts-linux + - test-fhg-linux-runner1 stage: test needs: ["build-codec-linux-make"] script: -- GitLab From 8e9196ad76e2367f6be7f43135d494b76b51a3ae Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 18:17:37 +0200 Subject: [PATCH 03/21] correct branch for script repo checkout --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 283f97e47b..a6d4eaa15d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -695,8 +695,7 @@ selection-test-processing: needs: ["build-codec-linux-make"] script: # get processing script code - # TODO: use main branch - - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b 50-change-loudness-warning-to-error + - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b main - mkdir -p ivas-processing-scripts/tests/data/testv - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/ -- GitLab From 38606411f5d7261b14215f123b5153e7cb62ab60 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 18:31:30 +0200 Subject: [PATCH 04/21] disable jobs temporarily --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6d4eaa15d..300c8ec3ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -310,7 +310,7 @@ build-codec-windows-msbuild: # --------------------------------------------------------------- # test that runs all modes with 1s input signals -codec-smoke-test: +.codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request @@ -336,7 +336,7 @@ codec-smoke-test: expose_as: "Smoke test results" # code selftest testvectors with memory-sanitizer binaries -codec-msan: +.codec-msan: extends: - .test-job-linux - .rules-merge-request @@ -359,7 +359,7 @@ codec-msan: expose_as: "msan selftest results" # code selftest testvectors with address-sanitizer binaries -codec-asan: +.codec-asan: extends: - .test-job-linux - .rules-merge-request @@ -382,7 +382,7 @@ codec-asan: expose_as: "asan selftest results" # test renderer executable -renderer-smoke-test: +.renderer-smoke-test: extends: - .test-job-linux - .rules-merge-request @@ -403,7 +403,7 @@ renderer-smoke-test: - report-junit.xml # test renderer executable with cmake + asan -renderer-asan: +.renderer-asan: extends: - .test-job-linux - .rules-merge-request @@ -427,7 +427,7 @@ renderer-asan: - report-junit.xml # test renderer executable with cmake + msan -renderer-msan: +.renderer-msan: extends: - .test-job-linux - .rules-merge-request @@ -451,7 +451,7 @@ renderer-msan: - report-junit.xml # compare renderer bitexactness between target and source branch -renderer-pytest-on-merge-request: +.renderer-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -506,7 +506,7 @@ renderer-pytest-on-merge-request: - report-junit.xml # compare bit exactness between target and source branch -ivas-pytest-on-merge-request: +.ivas-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -556,7 +556,7 @@ ivas-pytest-on-merge-request: junit: - report-junit.xml -evs-pytest-on-merge-request: +.evs-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -614,7 +614,7 @@ voip-be-on-merge-request: - *print-common-info - bash ci/ivas_voip_be_test.sh -clang-format-check: +.clang-format-check: extends: - .test-job-linux - .rules-merge-request @@ -742,7 +742,7 @@ selection-test-processing: - python ../ci/run_evs_be_win_test.py # check bitexactness to EVS -be-2-evs-linux: +.be-2-evs-linux: extends: - .test-job-linux - .rules-main-push @@ -768,7 +768,7 @@ be-2-evs-linux: - cd evs_be_test - python3 ../ci/run_evs_be_test.py -codec-comparison-on-main-push: +.codec-comparison-on-main-push: extends: - .test-job-linux - .rules-main-push -- GitLab From 423d0b83d7bfbb412f861390ddb94aeadc78c29a Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 18:34:46 +0200 Subject: [PATCH 05/21] copy binaries to local bin dir --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 300c8ec3ee..18e1711d5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ variables: OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" EXIT_CODE_NON_BE: 123 EXIT_CODE_FAIL: 1 + PROCESSING_SCRIPTS_BIN_DIR: "/test-bin" default: interruptible: true # Make all jobs by default interruptible @@ -699,6 +700,9 @@ selection-test-processing: - mkdir -p ivas-processing-scripts/tests/data/testv - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/ + # copy binaries into local bin dir, those should take precendence over PATH + - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ + # build codec and put into bin dir - make -j - cp ./IVAS_* ivas-processing-scripts/ivas_processing_scripts/bin/ -- GitLab From 81ef959932cb36b64314daddec58efc3bb015677 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 18:35:27 +0200 Subject: [PATCH 06/21] disable one more job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18e1711d5c..0a1e87f353 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -604,7 +604,7 @@ build-codec-windows-msbuild: junit: - report-junit-evs.xml -voip-be-on-merge-request: +.voip-be-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request -- GitLab From e397160c739cf5f83893420ffa5e94284d4e4bf1 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 19:00:12 +0200 Subject: [PATCH 07/21] try hack for native binary usage --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a1e87f353..3e563a2b5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -696,12 +696,17 @@ selection-test-processing: needs: ["build-codec-linux-make"] script: # get processing script code - - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b main + # TODO: use main again + - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b add_check_for_native_binary_in_test + - mkdir -p ivas-processing-scripts/tests/data/testv - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/ # copy binaries into local bin dir, those should take precendence over PATH - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ + # for testing with native binaries + - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe + - export USE_LINUX_BINARY="YES" # build codec and put into bin dir - make -j -- GitLab From ac3fe6578e945d546e8005dcc4c73cb451b850fd Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 16 Jun 2023 19:09:51 +0200 Subject: [PATCH 08/21] remove all exe's --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e563a2b5c..c8a946d4a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -706,6 +706,7 @@ selection-test-processing: - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ # for testing with native binaries - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe + - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe - export USE_LINUX_BINARY="YES" # build codec and put into bin dir -- GitLab From 5a9ceeffdf2cdacf2640ebba6941cdb83229c5db Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 19 Jun 2023 12:34:06 +0200 Subject: [PATCH 09/21] patch windows binary key --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bb8ef5444..f8485a1632 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -704,6 +704,10 @@ selection-test-processing: - make -j - cp ./IVAS_* ivas-processing-scripts/ivas_processing_scripts/bin/ + # patch the use_windows_codec_binaries key (weird folding is needed so colons are accepted) + - > + sed -i "s/use_windows_codec_binaries: true/use_windows_codec_binaries: false/" ivas-processing-scripts/ivas_processing_scripts/experiments/selection/*config/*.yml + # run experiments test - cd ivas-processing-scripts - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt -- GitLab From f418984dccb940d0681ee1f6e67648caae5da3d3 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 19 Jun 2023 12:37:31 +0200 Subject: [PATCH 10/21] fix config file wildcard --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa3880b442..ad6354b91c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -715,7 +715,7 @@ selection-test-processing: # patch the use_windows_codec_binaries key (weird folding is needed so colons are accepted) - > - sed -i "s/use_windows_codec_binaries: true/use_windows_codec_binaries: false/" ivas-processing-scripts/ivas_processing_scripts/experiments/selection/*config/*.yml + sed -i "s/use_windows_codec_binaries: true/use_windows_codec_binaries: false/" ivas-processing-scripts/experiments/selection/*/config/*.yml # run experiments test - cd ivas-processing-scripts -- GitLab From 8004c6d9ed71b8de487c96f5408e231ab4796f86 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 19 Jun 2023 17:42:49 +0200 Subject: [PATCH 11/21] Revert "disable one more job" This reverts commit 81ef959932cb36b64314daddec58efc3bb015677. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78473f4453..a4003cf2a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -606,7 +606,7 @@ build-codec-windows-msbuild: junit: - report-junit-evs.xml -.voip-be-on-merge-request: +voip-be-on-merge-request: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request -- GitLab From 66f9f4caae9f5bb0dd1d5494eb432fb9621ec4f8 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 19 Jun 2023 17:42:59 +0200 Subject: [PATCH 12/21] Revert "disable jobs temporarily" This reverts commit 38606411f5d7261b14215f123b5153e7cb62ab60. --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4003cf2a0..051d8f4ead 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -313,7 +313,7 @@ build-codec-windows-msbuild: # --------------------------------------------------------------- # test that runs all modes with 1s input signals -.codec-smoke-test: +codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request @@ -339,7 +339,7 @@ build-codec-windows-msbuild: expose_as: "Smoke test results" # code selftest testvectors with memory-sanitizer binaries -.codec-msan: +codec-msan: extends: - .test-job-linux - .rules-merge-request @@ -362,7 +362,7 @@ build-codec-windows-msbuild: expose_as: "msan selftest results" # code selftest testvectors with address-sanitizer binaries -.codec-asan: +codec-asan: extends: - .test-job-linux - .rules-merge-request @@ -385,7 +385,7 @@ build-codec-windows-msbuild: expose_as: "asan selftest results" # test renderer executable -.renderer-smoke-test: +renderer-smoke-test: extends: - .test-job-linux - .rules-merge-request @@ -406,7 +406,7 @@ build-codec-windows-msbuild: - report-junit.xml # test renderer executable with cmake + asan -.renderer-asan: +renderer-asan: extends: - .test-job-linux - .rules-merge-request @@ -430,7 +430,7 @@ build-codec-windows-msbuild: - report-junit.xml # test renderer executable with cmake + msan -.renderer-msan: +renderer-msan: extends: - .test-job-linux - .rules-merge-request @@ -454,7 +454,7 @@ build-codec-windows-msbuild: - report-junit.xml # compare renderer bitexactness between target and source branch -.renderer-pytest-on-merge-request: +renderer-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -509,7 +509,7 @@ build-codec-windows-msbuild: - report-junit.xml # compare bit exactness between target and source branch -.ivas-pytest-on-merge-request: +ivas-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -559,7 +559,7 @@ build-codec-windows-msbuild: junit: - report-junit.xml -.evs-pytest-on-merge-request: +evs-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -617,7 +617,7 @@ voip-be-on-merge-request: - *print-common-info - bash ci/ivas_voip_be_test.sh -.clang-format-check: +clang-format-check: extends: - .test-job-linux - .rules-merge-request @@ -763,7 +763,7 @@ selection-test-processing: - python ../ci/run_evs_be_win_test.py # check bitexactness to EVS -.be-2-evs-linux: +be-2-evs-linux: extends: - .test-job-linux - .rules-main-push @@ -789,7 +789,7 @@ selection-test-processing: - cd evs_be_test - python3 ../ci/run_evs_be_test.py -.codec-comparison-on-main-push: +codec-comparison-on-main-push: extends: - .test-job-linux - .rules-main-push -- GitLab From d9acbabeb08bcdb603d7ceea4fa3c2b3edb2c769 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 19 Jun 2023 17:46:15 +0200 Subject: [PATCH 13/21] use main branch from scripts repo --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 051d8f4ead..42e99b474f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -703,8 +703,7 @@ selection-test-processing: needs: ["build-codec-linux-make"] script: # get processing script code - # TODO: use main again - - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b add_check_for_native_binary_in_test + - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b main - mkdir -p ivas-processing-scripts/tests/data/testv - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/ @@ -714,7 +713,6 @@ selection-test-processing: # for testing with native binaries - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe - - export USE_LINUX_BINARY="YES" # build codec and put into bin dir - make -j -- GitLab From 109d80204fb09b76c6ee44fe6f9c4712d962b902 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 09:46:26 +0200 Subject: [PATCH 14/21] test selection test job on other runner --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42e99b474f..9bdf98598f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -698,7 +698,7 @@ selection-test-processing: - .test-job-linux-needs-testv-dir - .rules-merge-request tags: - - test-fhg-linux-runner1 + - test-fhg-linux-runner2 stage: test needs: ["build-codec-linux-make"] script: -- GitLab From bbee86fe0179f20165d58123786fb10a4faa0778 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 10:27:39 +0200 Subject: [PATCH 15/21] test ER runner with selection job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bdf98598f..48a3fccb24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -698,7 +698,7 @@ selection-test-processing: - .test-job-linux-needs-testv-dir - .rules-merge-request tags: - - test-fhg-linux-runner2 + - test-ericsson-linux-runner stage: test needs: ["build-codec-linux-make"] script: -- GitLab From 135be2f82efcea84bb66f3d1633ec8469c25cfd5 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 10:34:17 +0200 Subject: [PATCH 16/21] Revert "test ER runner with selection job" This reverts commit bbee86fe0179f20165d58123786fb10a4faa0778. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48a3fccb24..9bdf98598f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -698,7 +698,7 @@ selection-test-processing: - .test-job-linux-needs-testv-dir - .rules-merge-request tags: - - test-ericsson-linux-runner + - test-fhg-linux-runner2 stage: test needs: ["build-codec-linux-make"] script: -- GitLab From 39f368b90001a098b0794d7d2897d7897ef7a403 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 10:36:38 +0200 Subject: [PATCH 17/21] try getting binaries from PATH without copying --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bdf98598f..8fbe9332e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -709,7 +709,7 @@ selection-test-processing: - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/ # copy binaries into local bin dir, those should take precendence over PATH - - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ + # - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ # for testing with native binaries - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe -- GitLab From e5072f6e10b1e514bfe494fd1a0399a8275ec67e Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 10:43:27 +0200 Subject: [PATCH 18/21] comment out more stuff that may be unneeded now --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fbe9332e3..486983876b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -711,8 +711,8 @@ selection-test-processing: # copy binaries into local bin dir, those should take precendence over PATH # - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ # for testing with native binaries - - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe - - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe + # - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe + # - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe # build codec and put into bin dir - make -j -- GitLab From e20e393d07ab6be942081de82d05f77f66a5473a Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 10:54:48 +0200 Subject: [PATCH 19/21] Revert "comment out more stuff that may be unneeded now" This reverts commit e5072f6e10b1e514bfe494fd1a0399a8275ec67e. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 486983876b..8fbe9332e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -711,8 +711,8 @@ selection-test-processing: # copy binaries into local bin dir, those should take precendence over PATH # - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ # for testing with native binaries - # - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe - # - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe + - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe + - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe # build codec and put into bin dir - make -j -- GitLab From 42ec6d5c2e2e66dda84bc23143494e290a7dbb9c Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 10:54:57 +0200 Subject: [PATCH 20/21] Revert "try getting binaries from PATH without copying" This reverts commit 39f368b90001a098b0794d7d2897d7897ef7a403. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fbe9332e3..9bdf98598f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -709,7 +709,7 @@ selection-test-processing: - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/ # copy binaries into local bin dir, those should take precendence over PATH - # - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ + - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/ # for testing with native binaries - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe -- GitLab From 689e12410b636a6e59183d2b70b9976cad5bc7aa Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 20 Jun 2023 11:21:24 +0200 Subject: [PATCH 21/21] add general tag --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bdf98598f..319a4c5e73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -698,7 +698,7 @@ selection-test-processing: - .test-job-linux-needs-testv-dir - .rules-merge-request tags: - - test-fhg-linux-runner2 + - processing-scripts-linux stage: test needs: ["build-codec-linux-make"] script: -- GitLab