From 6f1d6deeac2513af3b2b32fd3efd99265e39a126 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 08:35:03 +0200 Subject: [PATCH 1/4] remove unintentionally added jobs from Draft pipeline --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f48458c78..cff514a63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1337,7 +1337,7 @@ build-codec-linux-debugging-make: split-rendering-smoke-test: extends: - .test-job-linux - - .rules-merge-request + - .rules-merge-request-to-main-pc needs: ["build-codec-linux-make"] stage: test script: @@ -1361,7 +1361,7 @@ split-rendering-smoke-test: lc3-wrapper-unit-test: extends: - .test-job-linux - - .rules-merge-request + - .rules-merge-request-to-main-pc needs: ["build-codec-linux-make"] stage: test script: @@ -1376,7 +1376,7 @@ lc3-wrapper-unit-test: split-rendering-pytest-on-merge-request: extends: - .test-job-linux-needs-testv-dir - - .rules-merge-request + - .rules-merge-request-to-main-pc needs: ["build-codec-linux-make"] timeout: "45 minutes" stage: compare -- GitLab From 22a2c05ed8af6fcbed7a33c01c497c358a283f21 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 08:37:50 +0200 Subject: [PATCH 2/4] also remove up-to-date jobs from Draft pls --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cff514a63..5f42dc146 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1047,7 +1047,7 @@ uninterruptible: branch-is-up-to-date-with-target-pre: extends: - - .rules-merge-request + - .rules-merge-request-to-main-pc stage: prevalidate needs: [] tags: @@ -1063,7 +1063,7 @@ branch-is-up-to-date-with-target-pre: branch-is-up-to-date-with-target-post: extends: - - .rules-merge-request + - .rules-merge-request-to-main-pc stage: postvalidate tags: - ivas-basop-linux -- GitLab From 30f81a176096066c1fc65ea263ac2b83b722591b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 09:23:21 +0200 Subject: [PATCH 3/4] increase timeout of build jobs to be in line with main --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f42dc146..c16992fdc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1251,6 +1251,7 @@ build-codec-linux-cmake: - .build-job-linux tags: - ivas-basop-linux + timeout: "10 minutes" script: - *print-common-info - *update-scripts-repo @@ -1322,7 +1323,7 @@ build-codec-linux-debugging-make: when: never extends: - .build-job-linux - timeout: "7 minutes" + timeout: "10 minutes" variables: BUILD_WITH_DEBUG_MODE_INFO: "true" script: -- GitLab From eddf4391f0f8d950af6854249e0399f3ec2d39f8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 8 May 2025 09:56:23 +0200 Subject: [PATCH 4/4] dummy commit to trigger CI -- GitLab