From 4bcd57b0b513a9e34801460a74476ba165be3eac Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 22 Aug 2024 09:55:05 +0100 Subject: [PATCH] ci/amd: Move manual/nightly jobs to postmerge stage Create a new stage called amd-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/amd/ci/gitlab-ci-inc.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 682bc01ad82..d5287b10e53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,6 +148,7 @@ stages: - build-misc - code-validation - amd + - amd-postmerge - intel - nouveau - arm diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index 10a9c86ae09..b9692f4f44e 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -43,7 +43,7 @@ when: on_success .radv-manual-rules: - stage: amd + stage: amd-postmerge rules: - !reference [.test, rules] - !reference [.vulkan-manual-rules, rules] @@ -76,7 +76,7 @@ - !reference [.radv-rules, rules] .radv-valve-manual-rules: - stage: amd + stage: amd-postmerge extends: .no-auto-retry rules: - !reference [.test, rules] @@ -101,7 +101,7 @@ when: on_success .radeonsi-vaapi-manual-rules: - stage: amd + stage: amd-postmerge rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -118,7 +118,7 @@ - !reference [.radeonsi-rules, rules] .radeonsi-valve-manual-rules: - stage: amd + stage: amd-postmerge rules: - !reference [.test, rules] - !reference [.valve-farm-manual-rules, rules]