From 4691bc5d2018304107a0d83f52722558180911f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 9 Dec 2020 11:02:09 +0100 Subject: [PATCH] ci: .lava-test:amd64 template needs arm_build It uses the arm_build image, but didn't depend on the job which ensures it exists. So jobs using the template could run before the arm_build job had finished, and fail if the image didn't exist. Fixes: 6c8b921572a5 "ci: Build kernels and rootfs for x86 devices" Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3632 Reviewed-by: Andres Gomez Reviewed-by: Tomeu Vizoso Part-of: (cherry picked from commit 5d073b5aa160adfe4c5e0b388bd199741f4893d8) --- .gitlab-ci/lava-gitlab-ci.yml | 1 + .pick_status.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index ad86b4d21d8..0a8582e4629 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -130,6 +130,7 @@ kernel+rootfs_armhf: - .use-arm_build needs: - kernel+rootfs_amd64 + - arm_build - meson-testing .lava-traces-base: diff --git a/.pick_status.json b/.pick_status.json index d7729f0158e..910d8e0efbe 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -202,7 +202,7 @@ "description": "ci: .lava-test:amd64 template needs arm_build", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "6c8b921572a542f5de62475a76501a9db73dae4d" },