diff options
| author | Tomeu Vizoso <[email protected]> | 2020-07-08 09:57:44 +0200 |
|---|---|---|
| committer | Tomeu Vizoso <[email protected]> | 2020-07-09 09:19:25 +0200 |
| commit | 315ac9410717b8a25ff501a724370272c6d54d90 (patch) | |
| tree | 19aabf1643c959f30a96749b09ca240f89ce3f80 /.gitlab-ci/lava-gitlab-ci.yml | |
| parent | 40526451ca5da669f6d8d11195538e4580d13531 (diff) | |
gitlab-ci: Remove left-behind rules:
It's something that was added to ease development, but that was supposed
to be removed before merging.
It also causes problems when arm-related jobs aren't enabled, as
arm_build is needed by these jobs but in that case isn't there.
Also extend from .ci-run-policy.
Signed-off-by: Tomeu Vizoso <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5802>
Diffstat (limited to '.gitlab-ci/lava-gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 77ec9b89728..5f7a919ab20 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -3,12 +3,12 @@ variables: .kernel+rootfs: stage: container-2 + extends: + - .ci-run-policy variables: GIT_STRATEGY: fetch script: - DEBIAN_ARCH=${DEBIAN_ARCH} .gitlab-ci/container/lava_arm.sh - rules: - - when: always kernel+rootfs_arm64: extends: |