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>
This commit is contained in:
Michel Dänzer 2019-12-06 09:39:40 +01:00 committed by Michel Dänzer
parent 0796e7e70d
commit ebd1309fef
1 changed files with 2 additions and 16 deletions

View File

@ -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