From 4752ce718699052f9ff4bac30f955a904e5ac087 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Thu, 22 Aug 2024 09:55:05 +0100
Subject: [PATCH] ci/zink: Move manual/nightly jobs to postmerge stage

Create a new stage called layered-backends-postmerge and move the full
and manual jobs over there, to avoid entanglement with the pre-merge
jobs.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30784>
---
 .gitlab-ci.yml                                |  1 +
 src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1aab649665..6c99b145127 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,6 +160,7 @@ stages:
   - etnaviv
   - software-renderer
   - layered-backends
+  - layered-backends-postmerge
   - performance
   - deploy
 
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index 58f4913021b..a4f4e65a857 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -47,7 +47,7 @@
     - !reference [.zink-common-rules, rules]
 
 .zink-anv-manual-rules:
-  stage: layered-backends
+  stage: layered-backends-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -70,7 +70,7 @@
     - !reference [.zink-common-rules, rules]
 
 .zink-nvk-manual-rules:
-  stage: layered-backends
+  stage: layered-backends-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -87,7 +87,7 @@
     ZINK_DEBUG: optimal_keys
 
 .zink-turnip-collabora-manual-rules:
-  stage: layered-backends
+  stage: layered-backends-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -95,7 +95,7 @@
     - !reference [.zink-common-manual-rules, rules]
 
 .zink-turnip-valve-manual-rules:
-  stage: layered-backends
+  stage: layered-backends-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.valve-freedreno-turnip-manual-rules, rules]
@@ -109,7 +109,7 @@
     - !reference [.zink-common-rules, rules]
 
 .zink-radv-manual-rules:
-  stage: layered-backends
+  stage: layered-backends-postmerge
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]