summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2020-07-21 16:13:37 +0200
committerMarge Bot <eric+marge@anholt.net>2020-07-23 09:26:30 +0000
commitd9693c6620d59557c44d785a95c38d961dd017bd (patch)
tree2ebaf94191a82c6f0dfe9d5747aa5b9ec8867f52 /.gitlab-ci
parente74933e8ab33d3aadcd86c2f5566c74bb76ca8ca (diff)
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>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 797afc4b25a..7ce27622bc1 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -30,6 +30,8 @@ kernel+rootfs_armhf:
.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"