From c00f017e65d63820d05893489ff8474930c2dd2e Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sun, 6 Oct 2019 09:12:00 -0700 Subject: [PATCH] gitlab-ci/lava: Fix image to use in test jobs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michel Dänzer --- .gitlab-ci/lava-gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: -- 2.30.2