From ac78ca4b39ce6e927f824b928d17f30c1d9273ce Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 12 Nov 2019 23:42:21 +0000 Subject: [PATCH 1/1] gitlab-ci: auto-cancel CI runs when a newer commit is pushed to the same branch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Eric Anholt Acked-by: Alyssa Rosenzweig Reviewed-by: Michel Dänzer --- .gitlab-ci.yml | 2 ++ .gitlab-ci/lava-gitlab-ci.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77219842df8..895017a6873 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,8 @@ stages: max: 2 when: - runner_system_failure + # Cancel CI run if a newer commit is pushed to the same branch + interruptible: true .ci-deqp-artifacts: artifacts: diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index b95dbea964a..e9b324b60c4 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -17,6 +17,8 @@ include: max: 2 when: - runner_system_failure + # Cancel CI run if a newer commit is pushed to the same branch + interruptible: true # Build Docker image with deqp, the rootfs and the build deps for Mesa .lava-container: -- 2.30.2