From b70ad23bb1fef0dc7fe8ebc5eb2f9d477ef422a9 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 22 Aug 2024 09:55:05 +0100 Subject: [PATCH] ci/nouveau: Move manual/nightly jobs to postmerge stage Create a new stage called nouveau-postmerge and move the full and manual jobs over there, to avoid entanglement with the pre-merge jobs. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci.yml | 1 + src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml | 2 +- src/nouveau/ci/gitlab-ci-inc.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca7d82cbf97..81d68fae460 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,6 +152,7 @@ stages: - intel - intel-postmerge - nouveau + - nouveau-postmerge - arm - broadcom - broadcom-postmerge diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml index 3257c800851..392ef7ecea3 100644 --- a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml @@ -24,7 +24,7 @@ when: on_success .nouveau-manual-rules: - stage: nouveau + stage: nouveau-postmerge extends: .no-auto-retry rules: - !reference [.test, rules] diff --git a/src/nouveau/ci/gitlab-ci-inc.yml b/src/nouveau/ci/gitlab-ci-inc.yml index 58c8029673e..81e035a9241 100644 --- a/src/nouveau/ci/gitlab-ci-inc.yml +++ b/src/nouveau/ci/gitlab-ci-inc.yml @@ -26,7 +26,7 @@ when: on_success .nvk-valve-manual-rules: - stage: nouveau + stage: nouveau-postmerge extends: .no-auto-retry rules: - !reference [.test, rules]