summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <[email protected]>2019-10-06 09:12:00 -0700
committerTomeu Vizoso <[email protected]>2019-10-07 07:31:55 -0700
commitc00f017e65d63820d05893489ff8474930c2dd2e (patch)
tree31956b4c8956b5a242eb523249b8f802bf4255d8
parent8d0830de05e5d6212a6a0e1b26ea52b0748b0264 (diff)
gitlab-ci/lava: Fix image to use in test jobs
In the test stage, we can use any of the two container images as we arent going to do anything architecture-dependent when submitting the jobs to LAVA. But if we are in a pipeline in which the images need to be rebuilt and one finishes much earlier than the other, it could happen that the test job that executes first fails to find the container image. To avoid that, have each job in the test stage to use the image that has been already implicitly built by depending on the build job for the given arch. Signed-off-by: Tomeu Vizoso <[email protected]> Reviewed-by: Michel Dänzer <[email protected]>
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index dcd170c38eb..9aaeddd8db5 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -160,7 +160,6 @@ lava-build:arm64:
.lava-test:
stage: test
- image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:arm64-$LAVA_IMAGE_TAG # Any of the images will be fine
extends:
- .ci-run-policy
variables:
@@ -179,6 +178,7 @@ lava-build:arm64:
- results/
panfrost-t760-test:armhf:
+ image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:armhf-$LAVA_IMAGE_TAG
extends: .lava-test
needs: ["lava-build:armhf"]
dependencies:
@@ -187,6 +187,7 @@ panfrost-t760-test:armhf:
- lava-rk3288-veyron-jaq
panfrost-t860-test:arm64:
+ image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:arm64-$LAVA_IMAGE_TAG
extends: .lava-test
needs: ["lava-build:arm64"]
dependencies: