From 2ce0b5ab0a66a3fc281c1577b74dab67023c3753 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 12 Jan 2024 19:27:12 +0000 Subject: [PATCH] ci: fix job dependency error in MRs for bin/ci/* scripts 'debian/x86_64_build' job needs 'debian/x86_64_build-base' job, but 'debian/x86_64_build-base' is not in any previous stage Fixes: f298a0e7092addb9db5a ("ci: make sure we evaluate the python-test rules first") Fixes: 2c9fdaa83013ac60b55e ("ci: fix python-test dependency error on merge requests") Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 6cd0d382a15..6e5e8b67c6a 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -68,6 +68,10 @@ debian/x86_64_build-base: - .debian-container variables: MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" + rules: + # python-test requires debian/x86_64_build, which requires this job + - !reference [python-test, rules] + - !reference [.container, rules] .use-debian/x86_64_build-base: extends: