From 337e00aa2dd81381b0202fa412e697c21ddfb1f1 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 22 Aug 2024 09:55:05 +0100 Subject: [PATCH] ci/llvmpipe: Move manual/nightly jobs to postmerge stage Create a new stage called software-backends-postmerge and move the full and manual jobs for both llvmpipe and lavapipe over there, to avoid entanglement with the pre-merge jobs. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci.yml | 1 + src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml | 2 +- src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c99b145127..ca7d82cbf97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,6 +159,7 @@ stages: - freedreno-postmerge - etnaviv - software-renderer + - software-renderer-postmerge - layered-backends - layered-backends-postmerge - performance diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml index 0b8644801e5..7e33b0a7778 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml @@ -20,7 +20,7 @@ when: on_success .llvmpipe-manual-rules: - stage: software-renderer + stage: software-renderer-postmerge extends: .no-auto-retry rules: - !reference [.test, rules] diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml index e61b9fba082..b0131e8e89a 100644 --- a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml +++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml @@ -22,7 +22,7 @@ when: on_success .lavapipe-manual-rules: - stage: software-renderer + stage: software-renderer-postmerge extends: .no-auto-retry rules: - !reference [.test, rules]