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: diff --git a/.pick_status.json b/.pick_status.json index 7be809c2b10..bde0c99a476 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -674,7 +674,7 @@ "description": "ci: fix job dependency error in MRs for bin/ci/* scripts", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f298a0e7092addb9db5ab14c9085cd5a0f54fa1d", "notes": null