From f37af2ab8c6bbe0b046b545ae1110c9322ca574a Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 2 Jul 2024 23:05:16 +0200 Subject: [PATCH] ci: split .no-auto-retry out of .scheduled_pipeline-rules Part-of: --- .gitlab-ci/test-source-dep.yml | 11 ++++++++--- src/amd/ci/gitlab-ci-inc.yml | 2 +- src/broadcom/ci/gitlab-ci-inc.yml | 8 ++++---- src/etnaviv/ci/gitlab-ci.yml | 2 +- src/freedreno/ci/gitlab-ci-inc.yml | 16 ++++++++-------- .../drivers/llvmpipe/ci/gitlab-ci-inc.yml | 2 +- src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml | 2 +- src/gallium/drivers/r300/ci/gitlab-ci-inc.yml | 4 ++-- src/gallium/drivers/svga/ci/gitlab-ci-inc.yml | 2 +- src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml | 4 ++-- src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 12 ++++++------ .../frontends/lavapipe/ci/gitlab-ci-inc.yml | 2 +- src/gallium/frontends/rusticl/ci/gitlab-ci.yml | 2 +- src/intel/ci/gitlab-ci-inc.yml | 12 ++++++------ src/nouveau/ci/gitlab-ci-inc.yml | 2 +- src/panfrost/ci/gitlab-ci.yml | 6 +++--- src/virtio/ci/gitlab-ci-inc.yml | 2 +- 17 files changed, 48 insertions(+), 43 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 2fed298ce94..575862e4b5b 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -6,6 +6,11 @@ rules: - if: &is-scheduled-pipeline '$CI_PIPELINE_SOURCE == "schedule"' when: on_success + +# Override of the `default: retry:` settings, which automatically retries jobs +# if one of the tests result didn't match its expectation; this override +# disables that, but keeps the auto-retry for infrastructure failures. +.no-auto-retry: retry: max: 1 # Don't retry on script_failure, job_execution_timeout, runner_unsupported, @@ -67,7 +72,7 @@ # Same core dependencies for doing manual runs. .core-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, 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 @@ -174,7 +179,7 @@ - !reference [.gallium-core-rules, rules] .gl-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.core-manual-rules, rules] - changes: @@ -193,7 +198,7 @@ when: on_success .vulkan-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.core-manual-rules, rules] - changes: diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index 29d0d905af6..35f3bbdcf31 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -75,7 +75,7 @@ .radv-valve-manual-rules: stage: amd - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.valve-farm-manual-rules, rules] diff --git a/src/broadcom/ci/gitlab-ci-inc.yml b/src/broadcom/ci/gitlab-ci-inc.yml index d6eec98c224..1dff8db9af3 100644 --- a/src/broadcom/ci/gitlab-ci-inc.yml +++ b/src/broadcom/ci/gitlab-ci-inc.yml @@ -41,7 +41,7 @@ .vc4-manual-rules: stage: broadcom - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.igalia-farm-manual-rules, rules] @@ -68,7 +68,7 @@ .v3d-manual-rules: stage: broadcom - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.igalia-farm-manual-rules, rules] @@ -86,7 +86,7 @@ .v3d-rusticl-manual-rules: stage: broadcom - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.v3d-manual-rules, rules] - !reference [.rusticl-manual-rules, rules] @@ -106,7 +106,7 @@ .v3dv-manual-rules: stage: broadcom - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.igalia-farm-manual-rules, rules] diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml index 77d6ebebd87..2b24aa7447c 100644 --- a/src/etnaviv/ci/gitlab-ci.yml +++ b/src/etnaviv/ci/gitlab-ci.yml @@ -22,7 +22,7 @@ .etnaviv-manual-rules: stage: etnaviv - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.austriancoder-farm-manual-rules, rules] diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 3a6d97045c5..8aa7191ab27 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -20,7 +20,7 @@ when: on_success .freedreno-common-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.core-manual-rules, rules] @@ -56,7 +56,7 @@ .google-freedreno-manual-rules: stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.freedreno-farm-manual-rules, rules] @@ -68,7 +68,7 @@ .collabora-freedreno-manual-rules: stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -102,7 +102,7 @@ .google-turnip-manual-rules: stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.freedreno-farm-manual-rules, rules] @@ -114,7 +114,7 @@ .collabora-turnip-manual-rules: stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -155,7 +155,7 @@ .valve-freedreno-turnip-manual-rules: stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.valve-farm-manual-rules, rules] @@ -181,7 +181,7 @@ .google-freedreno-rules-performance: stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.performance-rules, rules] @@ -197,7 +197,7 @@ .collabora-freedreno-rules-performance: stage: freedreno - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.performance-rules, rules] diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml index 9dd7bebb156..642a6b637a2 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml @@ -21,7 +21,7 @@ .llvmpipe-manual-rules: stage: software-renderer - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.gl-manual-rules, rules] diff --git a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml index 5968e135dcc..00964d6f496 100644 --- a/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml @@ -25,7 +25,7 @@ .nouveau-manual-rules: stage: nouveau - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.anholt-farm-manual-rules, rules] diff --git a/src/gallium/drivers/r300/ci/gitlab-ci-inc.yml b/src/gallium/drivers/r300/ci/gitlab-ci-inc.yml index d1182c7f28f..17d3b102b9a 100644 --- a/src/gallium/drivers/r300/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/r300/ci/gitlab-ci-inc.yml @@ -18,7 +18,7 @@ .r300-manual-rules: stage: amd - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.ondracka-farm-manual-rules, rules] @@ -38,7 +38,7 @@ .r300-nine-manual-rules: stage: amd - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.r300-manual-rules, rules] diff --git a/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml b/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml index 53113c37d55..6ea03660fda 100644 --- a/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/svga/ci/gitlab-ci-inc.yml @@ -13,7 +13,7 @@ when: on_success .vmware-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.vmware-farm-manual-rules, rules] diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml index 61b56188ed4..5d8ea799050 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml @@ -13,7 +13,7 @@ .virgl-iris-manual-rules: stage: layered-backends - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -25,7 +25,7 @@ .virgl-iris-rules-performance: stage: layered-backends - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 362e838b40a..ec67ebff862 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -16,7 +16,7 @@ when: on_success .zink-common-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.gl-manual-rules, rules] @@ -48,7 +48,7 @@ .zink-anv-manual-rules: stage: layered-backends - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.anv-manual-rules, rules] @@ -71,7 +71,7 @@ .zink-nvk-manual-rules: stage: layered-backends - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, 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 [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, 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 [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, 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 [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.radv-valve-manual-rules, rules] diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml index 97c431702a7..2a7fa692661 100644 --- a/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml +++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml @@ -23,7 +23,7 @@ .lavapipe-manual-rules: stage: software-renderer - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.vulkan-manual-rules, rules] diff --git a/src/gallium/frontends/rusticl/ci/gitlab-ci.yml b/src/gallium/frontends/rusticl/ci/gitlab-ci.yml index 1bb82933730..41a25a9d794 100644 --- a/src/gallium/frontends/rusticl/ci/gitlab-ci.yml +++ b/src/gallium/frontends/rusticl/ci/gitlab-ci.yml @@ -6,7 +6,7 @@ when: on_success .rusticl-manual-rules: - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.no_scheduled_pipelines-rules, rules] diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 22f4ae6b34f..4bfb31f21ae 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -42,7 +42,7 @@ .i915g-manual-rules: stage: intel - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.gl-manual-rules, rules] @@ -64,7 +64,7 @@ .crocus-manual-rules: stage: intel - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.anholt-farm-manual-rules, rules] @@ -88,7 +88,7 @@ .iris-manual-rules: stage: intel - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -102,7 +102,7 @@ # .performance-rules) .iris-rules-performance: stage: intel - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -133,7 +133,7 @@ .anv-manual-rules: stage: intel - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -156,7 +156,7 @@ .hasvk-manual-rules: stage: intel - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.anholt-farm-manual-rules, rules] diff --git a/src/nouveau/ci/gitlab-ci-inc.yml b/src/nouveau/ci/gitlab-ci-inc.yml index 64fe7c62e2d..b3900bd838b 100644 --- a/src/nouveau/ci/gitlab-ci-inc.yml +++ b/src/nouveau/ci/gitlab-ci-inc.yml @@ -24,7 +24,7 @@ .nvk-valve-manual-rules: stage: nouveau - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.valve-farm-manual-rules, rules] diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index 80b2f1f062b..86937357464 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -28,7 +28,7 @@ .panfrost-midgard-manual-rules: stage: arm - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -59,7 +59,7 @@ .panfrost-bifrost-gl-manual-rules: stage: arm - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] @@ -92,7 +92,7 @@ .panfrost-bifrost-vk-manual-rules: stage: arm - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.collabora-farm-manual-rules, rules] diff --git a/src/virtio/ci/gitlab-ci-inc.yml b/src/virtio/ci/gitlab-ci-inc.yml index 496963051b6..cc1cf225c32 100644 --- a/src/virtio/ci/gitlab-ci-inc.yml +++ b/src/virtio/ci/gitlab-ci-inc.yml @@ -9,7 +9,7 @@ .venus-manual-rules: stage: layered-backends - retry: !reference [.scheduled_pipeline-rules, retry] + retry: !reference [.no-auto-retry, retry] rules: - !reference [.test, rules] - !reference [.lavapipe-manual-rules, rules]