summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-10-08 17:50:07 +0200
committerMichel Dänzer <michel@daenzer.net>2019-10-09 16:19:56 +0200
commit94cfe590703018cf3d34a0c1f8667064919bf843 (patch)
treeb073f926c32fdd4ebb2b4ea08cbc136f19b7717d /.gitlab-ci
parent030e67fac31fe6e89b87fdace49cf6757f5c0b77 (diff)
downloadmesa-94cfe590703018cf3d34a0c1f8667064919bf843.tar.gz
gitlab-ci/lava: Add needs: for container image to test jobs
Without this, the test jobs could spuriously run after the container job failed or was cancelled, even if the build job didn't run at all. Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 9aaeddd8db5..1f4f17343c0 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -180,7 +180,9 @@ lava-build:arm64:
panfrost-t760-test:armhf:
image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:armhf-$LAVA_IMAGE_TAG
extends: .lava-test
- needs: ["lava-build:armhf"]
+ needs:
+ - lava-container:armhf
+ - lava-build:armhf
dependencies:
- lava-build:armhf
tags:
@@ -189,7 +191,9 @@ panfrost-t760-test:armhf:
panfrost-t860-test:arm64:
image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:arm64-$LAVA_IMAGE_TAG
extends: .lava-test
- needs: ["lava-build:arm64"]
+ needs:
+ - lava-container:arm64
+ - lava-build:arm64
dependencies:
- lava-build:arm64
tags: