summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-12-06 09:39:40 +0100
committerMichel Dänzer <michel@daenzer.net>2019-12-06 09:39:40 +0100
commitebd1309fef98e03460cb0485d53cbbf8227f9c04 (patch)
tree08ab76c91e08a5f4144313e1401c9ac63425c1db /.gitlab-ci
parent0796e7e70d4278352df9796e6d08a65c87660974 (diff)
gitlab-ci: Use the common run policy for LAVA jobs as well again
Having different policies could have some weird results, e.g. changes only touching documentation (where the intention is not to run the pipeline by default) would still create a pipeline with the LAVA jobs running by default. Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml18
1 files changed, 2 insertions, 16 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 2a816ff16a7..05465c78730 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -4,25 +4,11 @@ include:
ref: 0a9bdd33a98f05af6761ab118b5074952242aab0
file: '/templates/debian.yml'
-# When to automatically run the CI
-.lava-ci-run-policy:
- only:
- - branches@mesa/mesa
- - merge_requests
- - /^lava-ci([-/].*)?$/
- retry:
- 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:
extends:
- .debian@container-ifnot-exists
- .container
- - .lava-ci-run-policy
variables:
REPO_SUFFIX: ${CI_JOB_NAME}
DEBIAN_TAG: &debian_tag '2019-12-03-1'
@@ -64,7 +50,7 @@ lava_arm64:
image: $CI_REGISTRY_IMAGE/debian/lava_${DEBIAN_ARCH}:$TAG
extends:
- .build-linux
- - .lava-ci-run-policy
+ - .ci-run-policy
script:
# Build Mesa
- mkdir -p results mesa-build
@@ -141,7 +127,7 @@ lava-build:arm64:
.lava-test:
extends:
- - .lava-ci-run-policy
+ - .ci-run-policy
stage: test
variables:
GIT_STRATEGY: none # testing doesn't build anything from source