ci: Do not mark container / pages jobs as interruptible
If another MR was merged while these were still running for the main
project, the result could be no updated images in the main project
registry (forcing a rebuild of the new images in all forked projects) or
an outdated Mesa website.
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6011>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e97d9bf..f123aff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,6 +64,8 @@
test-docs:
extends: .docs-base
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
stage: container+docs
rules:
- *ignore_scheduled_pipelines
@@ -109,8 +111,6 @@
max: 2
when:
- runner_system_failure
- # Cancel CI run if a newer commit is pushed to the same branch
- interruptible: true
success:
stage: success
@@ -449,6 +449,8 @@
# Shared between windows and Linux
.build-common:
extends: .ci-run-policy
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
artifacts:
name: "mesa_${CI_JOB_NAME}"
when: always
@@ -784,6 +786,8 @@
.test:
extends:
- .ci-run-policy
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
before_script:
@@ -1115,6 +1119,8 @@
extends:
- .ci-run-policy
- .test
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
stage: test
artifacts:
when: always
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 797afc4b..7ce2762 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -30,6 +30,8 @@
.lava-test:
extends:
- .ci-run-policy
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
ENV_VARS: "DEQP_PARALLEL=6"
