From bb53e5f8930a043861d126b35fe5142371f945c2 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 24 Jan 2024 17:15:02 +0100 Subject: [PATCH 1/8] make all MR jobs run on the runner under test --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2cb41925e..6828dd6b60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,21 +223,21 @@ stages: # templates to define stages and platforms .test-job-linux: tags: - - ivas-linux + - test-fhg-linux-runner1 .build-job-linux: stage: build timeout: "4 minutes" needs: [] tags: - - ivas-linux + - test-fhg-linux-runner1 .build-job-windows: stage: build needs: [] timeout: "4 minutes" tags: - - ivas-windows + - test-fhg-linux-runner1 # template for test jobs on linux that need the TESTV_DIR .test-job-linux-needs-testv-dir: @@ -266,7 +266,7 @@ uninterruptible: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH when: always tags: - - ivas-linux + - test-fhg-linux-runner1 # --------------------------------------------------------------- # Validation jobs @@ -278,7 +278,7 @@ branch-is-up-to-date-with-main-pre: stage: prevalidate needs: [] tags: - - ivas-linux + - test-fhg-linux-runner1 script: - *get-commits-behind-count - echo $commits_behind_count @@ -289,7 +289,7 @@ branch-is-up-to-date-with-main-post: - .rules-merge-request stage: postvalidate tags: - - ivas-linux + - test-fhg-linux-runner1 script: - *get-commits-behind-count - echo $commits_behind_count @@ -409,7 +409,7 @@ codec-smoke-test: - .rules-merge-request timeout: "17 minutes" tags: - - ivas-linux-fast + - test-fhg-linux-runner1 stage: test needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] script: @@ -969,7 +969,7 @@ check-first-frame-is-sid: - .test-job-linux-needs-testv-dir - .rules-merge-request tags: - - ivas-linux + - test-fhg-linux-runner1 stage: test needs: ["build-codec-linux-cmake"] script: -- GitLab From 1277961a29f2d674c9845a52d8adff7827a1c750 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 24 Jan 2024 17:23:32 +0100 Subject: [PATCH 2/8] put commands for instrumented build job directly in ci file --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6828dd6b60..2a4c3f0bd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -237,7 +237,7 @@ stages: needs: [] timeout: "4 minutes" tags: - - test-fhg-linux-runner1 + - ivas-windows # template for test jobs on linux that need the TESTV_DIR .test-job-linux-needs-testv-dir: @@ -329,7 +329,11 @@ build-codec-instrumented-linux: script: - *print-common-info - *activate-Werror-linux - - bash ci/build_codec_instrumented_linux.sh + - cd scripts + - ./prepare_instrumentation.sh + - cd c-code_instrument + - make -j + # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan build-codec-sanitizers-linux: -- GitLab From 504577acc6a604189765fce16bae9237c97d1be2 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 24 Jan 2024 17:45:44 +0100 Subject: [PATCH 3/8] try changing timeout value --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a4c3f0bd8..40fead5536 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -325,7 +325,7 @@ build-codec-instrumented-linux: extends: - .build-job-linux - .rules-basis - timeout: "6 minutes" + timeout: "7 minutes" script: - *print-common-info - *activate-Werror-linux -- GitLab From 60f97a38d4cca41a671283a7c09c699a9e30ff9c Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 24 Jan 2024 18:01:08 +0100 Subject: [PATCH 4/8] try without changing dir --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40fead5536..91d9804f3a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -329,10 +329,8 @@ build-codec-instrumented-linux: script: - *print-common-info - *activate-Werror-linux - - cd scripts - - ./prepare_instrumentation.sh - - cd c-code_instrument - - make -j + - ./scripts/prepare_instrumentation.sh + - make -j -C scripts/c-code_instrument # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan -- GitLab From 37ccceea7e229af6d54ade6572c780da3f429faa Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:05:19 +0100 Subject: [PATCH 5/8] remove jobs for faster testing --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91d9804f3a..408c062ffc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,10 +57,10 @@ stages: - maintenance - prevalidate - build - - test - - compare - - postvalidate - - deploy + # - test + # - compare + # - postvalidate + # - deploy # --------------------------------------------------------------- # Generic script anchors @@ -299,7 +299,7 @@ branch-is-up-to-date-with-main-post: # Build jobs # --------------------------------------------------------------- -build-codec-linux-make: +.build-codec-linux-make: extends: - .build-job-linux - .rules-basis @@ -308,7 +308,7 @@ build-codec-linux-make: - *activate-Werror-linux - make -j -build-codec-linux-cmake: +.build-codec-linux-cmake: extends: - .build-job-linux - .rules-basis @@ -334,7 +334,7 @@ build-codec-instrumented-linux: # - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan -build-codec-sanitizers-linux: +.build-codec-sanitizers-linux: extends: - .build-job-linux - .rules-basis @@ -343,7 +343,7 @@ build-codec-sanitizers-linux: - *activate-Werror-linux - bash ci/build_codec_sanitizers_linux.sh -build-codec-include-split-linux-make: +.build-codec-include-split-linux-make: extends: - .build-job-linux - .rules-basis @@ -353,7 +353,7 @@ build-codec-include-split-linux-make: - *activate-Werror-linux - make -j INCLUDE_SPLIT=1 -build-codec-include-split-linux-cmake: +.build-codec-include-split-linux-cmake: extends: - .build-job-linux - .rules-basis @@ -367,7 +367,7 @@ build-codec-include-split-linux-cmake: - cd .. - make -C build -j -build-codec-windows-cmake: +.build-codec-windows-cmake: extends: - .build-job-windows - .rules-basis @@ -377,7 +377,7 @@ build-codec-windows-cmake: - cmake -G "Visual Studio 15 2017" . -Bbuild - cmake --build build -j -build-codec-windows-include-split-cmake: +.build-codec-windows-include-split-cmake: extends: - .build-job-windows - .rules-basis @@ -390,7 +390,7 @@ build-codec-windows-include-split-cmake: - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild - cmake --build build -j -build-codec-windows-msbuild: +.build-codec-windows-msbuild: extends: - .build-job-windows - .rules-basis -- GitLab From 8ae59d33c7ee6fd237c3d7f166d821a6c9d6edea Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:08:01 +0100 Subject: [PATCH 6/8] fix yaml file --- .gitlab-ci.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 408c062ffc..727eb3be2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,10 +57,10 @@ stages: - maintenance - prevalidate - build - # - test - # - compare - # - postvalidate - # - deploy + - test + - compare + - postvalidate + - deploy # --------------------------------------------------------------- # Generic script anchors @@ -405,7 +405,7 @@ build-codec-instrumented-linux: # --------------------------------------------------------------- # 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 @@ -439,7 +439,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 @@ -462,7 +462,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 @@ -485,7 +485,7 @@ codec-asan: expose_as: "asan selftest results" # code selftest testvectors with address-sanitizer binaries -codec-usan: +.codec-usan: extends: - .test-job-linux - .rules-merge-request @@ -508,7 +508,7 @@ codec-usan: expose_as: "usan selftest results" # test renderer executable -renderer-smoke-test: +.renderer-smoke-test: extends: - .test-job-linux - .rules-merge-request @@ -529,7 +529,7 @@ renderer-smoke-test: - report-junit.xml # test renderer executable with cmake + asan -renderer-asan: +.renderer-asan: extends: - .test-job-linux - .rules-merge-request @@ -552,7 +552,7 @@ renderer-asan: - report-junit.xml # test renderer executable with cmake + msan -renderer-msan: +.renderer-msan: extends: - .test-job-linux - .rules-merge-request @@ -575,7 +575,7 @@ renderer-msan: - report-junit.xml # test renderer executable with cmake + usan -renderer-usan: +.renderer-usan: extends: - .test-job-linux - .rules-merge-request @@ -602,7 +602,7 @@ renderer-usan: - 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 @@ -653,7 +653,7 @@ renderer-pytest-on-merge-request: - report-junit.xml # test split rendering -split-rendering-smoke-test: +.split-rendering-smoke-test: extends: - .test-job-linux - .rules-merge-request @@ -675,7 +675,7 @@ split-rendering-smoke-test: - report-junit.xml # compare split-rendering bitexactness between target and source branch -split-rendering-pytest-on-merge-request: +.split-rendering-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -747,7 +747,7 @@ split-rendering-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 @@ -803,7 +803,7 @@ ivas-pytest-on-merge-request: # Check interop IVAS_cod_test -> IVAS_dec_ref -ivas-interop-on-merge-request: +.ivas-interop-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -857,7 +857,7 @@ ivas-interop-on-merge-request: junit: - report*-junit.xml -evs-pytest-on-merge-request: +.evs-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -908,7 +908,7 @@ evs-pytest-on-merge-request: 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 @@ -966,7 +966,7 @@ clang-format-check: expose_as: "formatting patch" # check for crashes if first received frame on decoder side is an SID -check-first-frame-is-sid: +.check-first-frame-is-sid: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request @@ -1005,7 +1005,7 @@ check-first-frame-is-sid: expose_as: "logs-sidstart" expire_in: "5 days" -lc3plus-ensure-no-code-changes: +.lc3plus-ensure-no-code-changes: extends: - .test-job-linux - .rules-merge-request -- GitLab From 51b8c841899311f930e55ea1fc55541a2d78a599 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:09:07 +0100 Subject: [PATCH 7/8] fix yaml file --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 727eb3be2d..22141e10b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1025,7 +1025,7 @@ clang-format-check: # --------------------------------------------------------------- # check bitexactness to EVS windows binaries -be-2-evs-windows: +.be-2-evs-windows: extends: - .rules-main-push tags: @@ -1049,7 +1049,7 @@ be-2-evs-windows: - 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 @@ -1075,7 +1075,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 @@ -1162,7 +1162,7 @@ codec-comparison-on-main-push: # Manual jobs # --------------------------------------------------------------- -test-be-to-release: +.test-be-to-release: stage: test tags: - ivas-windows @@ -1189,7 +1189,7 @@ test-be-to-release: expose_as: "test-be-to-release results" -test-long-self-test: +.test-long-self-test: tags: - ivas-linux-fast stage: compare -- GitLab From e63e6c78acf8a8e267de81b495dbe0480f0a1abb Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 25 Jan 2024 10:15:14 +0100 Subject: [PATCH 8/8] test other runner --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22141e10b1..27f9631132 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,14 +223,14 @@ stages: # templates to define stages and platforms .test-job-linux: tags: - - test-fhg-linux-runner1 + - test-fhg-linux-runner2 .build-job-linux: stage: build timeout: "4 minutes" needs: [] tags: - - test-fhg-linux-runner1 + - test-fhg-linux-runner2 .build-job-windows: stage: build @@ -272,7 +272,7 @@ uninterruptible: # Validation jobs # --------------------------------------------------------------- -branch-is-up-to-date-with-main-pre: +.branch-is-up-to-date-with-main-pre: extends: - .rules-merge-request stage: prevalidate @@ -284,7 +284,7 @@ branch-is-up-to-date-with-main-pre: - echo $commits_behind_count - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi; -branch-is-up-to-date-with-main-post: +.branch-is-up-to-date-with-main-post: extends: - .rules-merge-request stage: postvalidate @@ -919,7 +919,7 @@ build-codec-instrumented-linux: - *print-common-info - bash ci/ivas_voip_be_test.sh -clang-format-check: +.clang-format-check: extends: - .test-job-linux - .rules-merge-request -- GitLab