From a44da83b31107a9434e3f2dcbb8d3b5257761379 Mon Sep 17 00:00:00 2001 From: Sumeyra Demir Kanik Date: Thu, 27 Jun 2024 14:24:44 +0000 Subject: [PATCH 1/2] Update .gitlab-ci.yml --- .gitlab-ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13df7886bc..3c75231346 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -279,14 +279,14 @@ stages: # templates to define stages and platforms .test-job-linux: tags: - - ivas-linux + - test-ericsson-linux-runner-7 .build-job-linux: stage: build timeout: "4 minutes" needs: [] tags: - - ivas-linux + - test-ericsson-linux-runner-7 .build-job-windows: stage: build @@ -368,7 +368,7 @@ uninterruptible: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH when: always tags: - - ivas-linux + - test-ericsson-linux-runner-7 # --------------------------------------------------------------- # Validation jobs @@ -380,7 +380,7 @@ branch-is-up-to-date-with-main-pre: stage: prevalidate needs: [] tags: - - ivas-linux + - test-ericsson-linux-runner-7 script: - *get-commits-behind-count - echo $commits_behind_count @@ -392,7 +392,7 @@ check-self-test-names-pre: stage: prevalidate needs: [] tags: - - ivas-linux + - test-ericsson-linux-runner-7 script: - python3 ci/check_self_test_names.py scripts/config/self_test.prm 135 @@ -402,7 +402,7 @@ branch-is-up-to-date-with-main-post: - .rules-merge-request stage: postvalidate tags: - - ivas-linux + - test-ericsson-linux-runner-7 script: - *get-commits-behind-count - echo $commits_behind_count @@ -485,7 +485,7 @@ codec-smoke-test: - .rules-merge-request timeout: "20 minutes" tags: - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast stage: test needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] script: @@ -515,7 +515,7 @@ codec-msan: extends: - .sanitizer-selftest-on-mr tags: - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast before_script: - CLANG_NUM=1 - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS @@ -537,7 +537,7 @@ codec-usan: extends: - .sanitizer-selftest-on-mr tags: - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast before_script: - CLANG_NUM=3 - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS @@ -1070,7 +1070,7 @@ check-first-frame-is-sid: - .test-job-linux-needs-testv-dir - .rules-merge-request tags: - - ivas-linux + - test-ericsson-linux-runner-7 stage: test needs: ["build-codec-linux-cmake"] script: @@ -1417,7 +1417,7 @@ ivas-conformance: ivas-conformance-linux: tags: - - ivas-linux + - test-ericsson-linux-runner-7 stage: test timeout: "90 minutes" rules: @@ -1524,7 +1524,7 @@ ivas-conformance-linux: test-long-self-test: tags: - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast stage: compare resource_group: ivas-long-self-test-resource timeout: "50 minutes" @@ -1605,7 +1605,7 @@ ltv-msan: - if: $SANITIZER_SCHEDULE_E timeout: 4 hour tags: - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast before_script: - CLANG_NUM=1 - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS @@ -1621,7 +1621,7 @@ ltv-asan: when: delayed start_in: 4 hours tags: - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast timeout: 3 hour before_script: - CLANG_NUM=2 @@ -1638,7 +1638,7 @@ ltv-usan: when: delayed start_in: 7 hours tags: - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast timeout: 3 hour before_script: - CLANG_NUM=3 @@ -1652,7 +1652,7 @@ ltv-usan: stage: test tags: - sanitizer_test_main - - ivas-linux-fast + - test-ericsson-linux-runner-7-fast artifacts: name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA" expire_in: 2 weeks @@ -2179,7 +2179,7 @@ coverage-test-on-main-scheduled: - .test-job-linux-needs-testv-dir - .rules-main-scheduled tags: - - ivas-linux + - test-ericsson-linux-runner-7 stage: test rules: # only run in scheduled pipeline that passes this env vars @@ -2392,7 +2392,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: pages: stage: deploy tags: - - ivas-linux + - test-ericsson-linux-runner-7 rules: - if: $UPDATE_PAGES script: -- GitLab From 2507050214fe7768c081f2964eb4a693071725c1 Mon Sep 17 00:00:00 2001 From: Sumeyra Demir Kanik Date: Thu, 27 Jun 2024 14:35:44 +0000 Subject: [PATCH 2/2] Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c75231346..55d06b2c7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -485,7 +485,7 @@ codec-smoke-test: - .rules-merge-request timeout: "20 minutes" tags: - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast stage: test needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] script: @@ -515,7 +515,7 @@ codec-msan: extends: - .sanitizer-selftest-on-mr tags: - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast before_script: - CLANG_NUM=1 - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS @@ -537,7 +537,7 @@ codec-usan: extends: - .sanitizer-selftest-on-mr tags: - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast before_script: - CLANG_NUM=3 - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS @@ -1524,7 +1524,7 @@ ivas-conformance-linux: test-long-self-test: tags: - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast stage: compare resource_group: ivas-long-self-test-resource timeout: "50 minutes" @@ -1605,7 +1605,7 @@ ltv-msan: - if: $SANITIZER_SCHEDULE_E timeout: 4 hour tags: - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast before_script: - CLANG_NUM=1 - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS @@ -1621,7 +1621,7 @@ ltv-asan: when: delayed start_in: 4 hours tags: - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast timeout: 3 hour before_script: - CLANG_NUM=2 @@ -1638,7 +1638,7 @@ ltv-usan: when: delayed start_in: 7 hours tags: - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast timeout: 3 hour before_script: - CLANG_NUM=3 @@ -1652,7 +1652,7 @@ ltv-usan: stage: test tags: - sanitizer_test_main - - test-ericsson-linux-runner-7-fast + - ivas-linux-fast artifacts: name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA" expire_in: 2 weeks -- GitLab