OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: simplify setting .no-auto-retry now that it isn't bundled with unrelated rules:

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30004>
This commit is contained in:
Eric Engestrom
2024-07-02 23:09:05 +02:00
committed by Marge Bot
parent f37af2ab8c
commit 801ed4d032
17 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci/test-source-dep.yml
View File

@@ -72,7 +72,7 @@
# Same core dependencies for doing manual runs.
.core-manual-rules:
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
# We only want manual jobs to show up when it's not marge's pre-merge CI
# run, otherwise she'll wait until her timeout. The exception is
@@ -179,7 +179,7 @@
- !reference [.gallium-core-rules, rules]
.gl-manual-rules:
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.core-manual-rules, rules]
- changes:
@@ -198,7 +198,7 @@
when: on_success
.vulkan-manual-rules:
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.core-manual-rules, rules]
- changes:

2
src/amd/ci/gitlab-ci-inc.yml
View File

@@ -75,7 +75,7 @@
.radv-valve-manual-rules:
stage: amd
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.valve-farm-manual-rules, rules]

8
src/broadcom/ci/gitlab-ci-inc.yml
View File

@@ -41,7 +41,7 @@
.vc4-manual-rules:
stage: broadcom
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.igalia-farm-manual-rules, rules]
@@ -68,7 +68,7 @@
.v3d-manual-rules:
stage: broadcom
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.igalia-farm-manual-rules, rules]
@@ -86,7 +86,7 @@
.v3d-rusticl-manual-rules:
stage: broadcom
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.v3d-manual-rules, rules]
- !reference [.rusticl-manual-rules, rules]
@@ -106,7 +106,7 @@
.v3dv-manual-rules:
stage: broadcom
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.igalia-farm-manual-rules, rules]

2
src/etnaviv/ci/gitlab-ci.yml
View File

@@ -22,7 +22,7 @@
.etnaviv-manual-rules:
stage: etnaviv
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.austriancoder-farm-manual-rules, rules]

16
src/freedreno/ci/gitlab-ci-inc.yml
View File

@@ -20,7 +20,7 @@
when: on_success
.freedreno-common-manual-rules:
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.core-manual-rules, rules]
@@ -56,7 +56,7 @@
.google-freedreno-manual-rules:
stage: freedreno
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.freedreno-farm-manual-rules, rules]
@@ -68,7 +68,7 @@
.collabora-freedreno-manual-rules:
stage: freedreno
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -102,7 +102,7 @@
.google-turnip-manual-rules:
stage: freedreno
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.freedreno-farm-manual-rules, rules]
@@ -114,7 +114,7 @@
.collabora-turnip-manual-rules:
stage: freedreno
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -155,7 +155,7 @@
.valve-freedreno-turnip-manual-rules:
stage: freedreno
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.valve-farm-manual-rules, rules]
@@ -181,7 +181,7 @@
.google-freedreno-rules-performance:
stage: freedreno
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.performance-rules, rules]
@@ -197,7 +197,7 @@
.collabora-freedreno-rules-performance:
stage: freedreno
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.performance-rules, rules]

2
src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
View File

@@ -21,7 +21,7 @@
.llvmpipe-manual-rules:
stage: software-renderer
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.gl-manual-rules, rules]

2
src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml
View File

@@ -25,7 +25,7 @@
.nouveau-manual-rules:
stage: nouveau
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.anholt-farm-manual-rules, rules]

4
src/gallium/drivers/r300/ci/gitlab-ci-inc.yml
View File

@@ -18,7 +18,7 @@
.r300-manual-rules:
stage: amd
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.ondracka-farm-manual-rules, rules]
@@ -38,7 +38,7 @@
.r300-nine-manual-rules:
stage: amd
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.r300-manual-rules, rules]

2
src/gallium/drivers/svga/ci/gitlab-ci-inc.yml
View File

@@ -13,7 +13,7 @@
when: on_success
.vmware-manual-rules:
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.vmware-farm-manual-rules, rules]

4
src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
View File

@@ -13,7 +13,7 @@
.virgl-iris-manual-rules:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -25,7 +25,7 @@
.virgl-iris-rules-performance:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]

12
src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
View File

@@ -16,7 +16,7 @@
when: on_success
.zink-common-manual-rules:
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.gl-manual-rules, rules]
@@ -48,7 +48,7 @@
.zink-anv-manual-rules:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.anv-manual-rules, rules]
@@ -71,7 +71,7 @@
.zink-nvk-manual-rules:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.nvk-valve-manual-rules, rules]
@@ -88,7 +88,7 @@
.zink-turnip-collabora-manual-rules:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-turnip-manual-rules, rules]
@@ -96,7 +96,7 @@
.zink-turnip-valve-manual-rules:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.valve-freedreno-turnip-manual-rules, rules]
- !reference [.zink-common-manual-rules, rules]
@@ -110,7 +110,7 @@
.zink-radv-manual-rules:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.radv-valve-manual-rules, rules]

2
src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml
View File

@@ -23,7 +23,7 @@
.lavapipe-manual-rules:
stage: software-renderer
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.vulkan-manual-rules, rules]

2
src/gallium/frontends/rusticl/ci/gitlab-ci.yml
View File

@@ -6,7 +6,7 @@
when: on_success
.rusticl-manual-rules:
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.no_scheduled_pipelines-rules, rules]

12
src/intel/ci/gitlab-ci-inc.yml
View File

@@ -42,7 +42,7 @@
.i915g-manual-rules:
stage: intel
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.gl-manual-rules, rules]
@@ -64,7 +64,7 @@
.crocus-manual-rules:
stage: intel
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.anholt-farm-manual-rules, rules]
@@ -88,7 +88,7 @@
.iris-manual-rules:
stage: intel
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -102,7 +102,7 @@
# .performance-rules)
.iris-rules-performance:
stage: intel
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -133,7 +133,7 @@
.anv-manual-rules:
stage: intel
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -156,7 +156,7 @@
.hasvk-manual-rules:
stage: intel
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.anholt-farm-manual-rules, rules]

2
src/nouveau/ci/gitlab-ci-inc.yml
View File

@@ -24,7 +24,7 @@
.nvk-valve-manual-rules:
stage: nouveau
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.valve-farm-manual-rules, rules]

6
src/panfrost/ci/gitlab-ci.yml
View File

@@ -28,7 +28,7 @@
.panfrost-midgard-manual-rules:
stage: arm
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -59,7 +59,7 @@
.panfrost-bifrost-gl-manual-rules:
stage: arm
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]
@@ -92,7 +92,7 @@
.panfrost-bifrost-vk-manual-rules:
stage: arm
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.collabora-farm-manual-rules, rules]

2
src/virtio/ci/gitlab-ci-inc.yml
View File

@@ -9,7 +9,7 @@
.venus-manual-rules:
stage: layered-backends
retry: !reference [.no-auto-retry, retry]
extends: .no-auto-retry
rules:
- !reference [.test, rules]
- !reference [.lavapipe-manual-rules, rules]