From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Wed, 8 Jul 2020 07:57:44 +0000 (+0200)
Subject: gitlab-ci: Remove left-behind rules:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=315ac9410717b8a25ff501a724370272c6d54d90;p=mesa.git

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 <tomeu.vizoso@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5802>
---

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: