xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit b1ee4036bfd59dfd506ed8312b63edffc913b1c1
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Mon Dec 23 10:06:25 2019 +0100

    gitlab-ci: Mark jobs as interruptible
    
    Allowing redundant pipelines to be automatically cancelled.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6dc7de8bf..d80e5e848 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,12 +30,14 @@ stages:
     - docker-image
     - build-and-test
 
-# Retry jobs after runner system failures
 .ci-run-policy:
+  # Retry jobs after runner system failures
   retry:
     max: 2
     when:
       - runner_system_failure
+  # Cancel CI run if a newer commit is pushed to the same branch
+  interruptible: true
 
 debian-testing:
   extends:
commit 1e9c63beddb3010bb1f6eb96679410ca0aca037e
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Mon Dec 23 10:03:20 2019 +0100

    gitlab-ci: Turn .retry YAML anchor into .ci-run-policy template
    
    To match Mesa.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a4af4297..6dc7de8bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,19 +31,20 @@ stages:
     - build-and-test
 
 # Retry jobs after runner system failures
-.retry: &retry
+.ci-run-policy:
   retry:
     max: 2
     when:
       - runner_system_failure
 
 debian-testing:
-  extends: .debian at container-ifnot-exists
+  extends:
+    - .debian at container-ifnot-exists
+    - .ci-run-policy
   stage: docker-image
-  <<: *retry
 
 .common-build-and-test:
-    <<: *retry
+    extends: .ci-run-policy
     stage: build-and-test
     image: $IMAGE_LOCAL
     artifacts: