From 1d6f700a00654dbfb4962aad9b4232c7c3d8aa23 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 30 Jul 2025 09:54:31 +0200 Subject: [PATCH 1/2] add tags to regression jobs they were lost in the forest of "extends:" .... --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8acbd24b..b33cceacd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1492,6 +1492,8 @@ check-regressions-short-enc-0db: - job: build-codec-linux-make extends: - .rules-mr-to-main-or-main-pc + tags: + - ivas-basop-linux before_script: - *set-reference-for-basop-port-branch - USE_LTV=0 @@ -1512,6 +1514,8 @@ check-regressions-short-enc-+10db: - job: build-codec-linux-make extends: - .rules-mr-to-main-or-main-pc + tags: + - ivas-basop-linux before_script: - *set-reference-for-basop-port-branch - USE_LTV=0 @@ -1532,6 +1536,8 @@ check-regressions-short-enc--10db: - job: build-codec-linux-make extends: - .rules-mr-to-main-or-main-pc + tags: + - ivas-basop-linux before_script: - *set-reference-for-basop-port-branch - USE_LTV=0 @@ -1552,6 +1558,8 @@ check-regressions-short-dec-0db: - job: build-codec-linux-make extends: - .rules-mr-to-main-or-main-pc + tags: + - ivas-basop-linux before_script: - *set-reference-for-basop-port-branch - USE_LTV=0 @@ -1572,6 +1580,8 @@ check-regressions-short-dec-+10db: - job: build-codec-linux-make extends: - .rules-mr-to-main-or-main-pc + tags: + - ivas-basop-linux before_script: - *set-reference-for-basop-port-branch - USE_LTV=0 @@ -1592,6 +1602,8 @@ check-regressions-short-dec--10db: - job: build-codec-linux-make extends: - .rules-mr-to-main-or-main-pc + tags: + - ivas-basop-linux before_script: - *set-reference-for-basop-port-branch - USE_LTV=0 -- GitLab From e59a587856772bae4f7621cfbfb3346d52d4434f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 30 Jul 2025 10:00:30 +0200 Subject: [PATCH 2/2] ivas-linux -> ivas-basop-linux --- .gitlab-ci.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b33cceacd..d48b9d67f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -448,7 +448,7 @@ stages: # templates to define stages and platforms .test-job-linux: tags: - - ivas-linux + - ivas-basop-linux .test-job-linux-compares-to-fixed-target: extends: .test-job-linux @@ -461,7 +461,7 @@ stages: stage: build timeout: "2 minutes" tags: - - ivas-linux + - ivas-basop-linux .build-job-windows: stage: build @@ -1001,7 +1001,7 @@ uninterruptible: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH when: always tags: - - ivas-linux + - ivas-basop-linux # --------------------------------------------------------------- # Validation jobs @@ -1016,7 +1016,7 @@ fail-pipeline-if-in-draft: when: never stage: postvalidate tags: - - ivas-linux + - ivas-basop-linux script: - echo "Your MR is still in Draft state, set it to ready to be mergable, then retrigger the pipeline." - exit 1 @@ -1027,7 +1027,7 @@ check-naming-of-branch-for-main-pc-merges: - .rules-merge-request-to-main-pc stage: prevalidate tags: - - ivas-linux + - ivas-basop-linux script: - *update-scripts-repo - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then @@ -1044,7 +1044,7 @@ branch-is-up-to-date-with-target-pre: stage: prevalidate needs: [] tags: - - ivas-linux + - ivas-basop-linux script: - *get-commits-behind-count - | @@ -1065,7 +1065,7 @@ branch-is-up-to-date-with-target-post: - .rules-merge-request stage: postvalidate tags: - - ivas-linux + - ivas-basop-linux script: - *get-commits-behind-count - | @@ -1090,7 +1090,7 @@ clang-format-check: ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix" stage: prevalidate tags: - - ivas-linux + - ivas-basop-linux needs: [] timeout: "5 minutes" script: @@ -1173,7 +1173,7 @@ build-codec-linux-make: extends: - .build-job-linux tags: - - ivas-linux + - ivas-basop-linux timeout: "10 minutes" script: - *print-common-info @@ -1191,7 +1191,7 @@ build-codec-linux-cmake: extends: - .build-job-linux tags: - - ivas-linux + - ivas-basop-linux timeout: "10 minutes" script: - *print-common-info @@ -1212,7 +1212,7 @@ build-codec-linux-instrumented-make: - .build-job-linux timeout: "10 minutes" tags: - - ivas-linux + - ivas-basop-linux script: - *print-common-info - *update-scripts-repo @@ -1226,7 +1226,7 @@ build-codec-sanitizers-linux: - .build-job-linux - .rules-basis tags: - - ivas-linux + - ivas-basop-linux timeout: "10 minutes" script: - *update-scripts-repo @@ -1662,7 +1662,7 @@ ivas-pytest-enc-msan: extends: - .test-job-linux tags: - - ivas-linux-fast + - ivas-basop-linux-fast before_script: - CLANG_NUM=1 - DUT_DECODER_PATH=./$REF_DECODER_PATH @@ -1673,7 +1673,7 @@ ivas-pytest-enc-asan: extends: - .test-job-linux tags: - - ivas-linux-fast + - ivas-basop-linux-fast before_script: - CLANG_NUM=2 - DUT_DECODER_PATH=./$REF_DECODER_PATH @@ -1684,7 +1684,7 @@ ivas-pytest-enc-usan: extends: - .test-job-linux tags: - - ivas-linux-fast + - ivas-basop-linux-fast before_script: - CLANG_NUM=3 - DUT_DECODER_PATH=./$REF_DECODER_PATH @@ -1752,7 +1752,7 @@ ivas-pytest-dec-msan: extends: - .test-job-linux tags: - - ivas-linux-fast + - ivas-basop-linux-fast before_script: - CLANG_NUM=1 - DUT_ENCODER_PATH=./$REF_ENCODER_PATH @@ -1763,7 +1763,7 @@ ivas-pytest-dec-asan: extends: - .test-job-linux tags: - - ivas-linux-fast + - ivas-basop-linux-fast before_script: - CLANG_NUM=2 - DUT_ENCODER_PATH=./$REF_ENCODER_PATH @@ -1774,7 +1774,7 @@ ivas-pytest-dec-usan: extends: - .test-job-linux tags: - - ivas-linux-fast + - ivas-basop-linux-fast before_script: - CLANG_NUM=3 - DUT_ENCODER_PATH=./$REF_ENCODER_PATH @@ -2054,7 +2054,7 @@ voip-be-on-merge-request: - .rules-merge-request-no-draft timeout: "20 minutes" tags: - - ivas-linux + - ivas-basop-linux stage: test needs: ["build-codec-linux-make"] #, "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] script: @@ -2088,7 +2088,7 @@ renderer-pytest-on-merge-request: # TODO: set reasonable timeout, will most likely take less timeout: "20 minutes" tags: - - ivas-linux + - ivas-basop-linux stage: compare script: - *print-common-info @@ -2148,7 +2148,7 @@ ivas-pytest-on-merge-request: # thus, overall, this should save time timeout: "40 minutes" tags: - - ivas-linux + - ivas-basop-linux script: - *print-common-info - *get-commits-behind-count @@ -2641,7 +2641,7 @@ complexity-osba-in-binaural_room_ir-out: pages: stage: deploy tags: - - ivas-linux + - ivas-basop-linux rules: - if: $UPDATE_PAGES script: -- GitLab