From ce34ec41cde0a263853cb9e2056163fde89a96e7 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27042>
(cherry picked from commit 2ce0b5ab0a66a3fc281c1577b74dab67023c3753)
---
 .gitlab-ci/container/gitlab-ci.yml | 4 ++++
 .pick_status.json                  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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