ci: Make the retry policy default for all jobs.

We had to make sure to enable .ci-run-policy from every job to get the
retry, but we can just put it in the default section.

Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17386>
This commit is contained in:
Emma Anholt
2022-07-07 11:32:45 -07:00
committed by Marge Bot
parent 90114fb034
commit 7c2fe7bf4b
2 changed files with 12 additions and 10 deletions

View File

@@ -37,6 +37,12 @@ default:
export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" && export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" &&
rm "${CI_JOB_JWT_FILE}" rm "${CI_JOB_JWT_FILE}"
# Retry build or test jobs up to twice when the gitlab-runner itself fails somehow.
retry:
max: 2
when:
- runner_system_failure
include: include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'
ref: 34f4ade99434043f88e164933f570301fd18b125 ref: 34f4ade99434043f88e164933f570301fd18b125
@@ -195,10 +201,6 @@ test-docs-mr:
- src/**/* - src/**/*
when: on_success when: on_success
# Otherwise, build/test jobs won't run because no rule matched. # Otherwise, build/test jobs won't run because no rule matched.
retry:
max: 2
when:
- runner_system_failure
.ci-deqp-artifacts: .ci-deqp-artifacts:

View File

@@ -368,7 +368,7 @@ debian/arm_test:
.windows_container_build: .windows_container_build:
inherit: inherit:
default: false default: [retry]
extends: extends:
- .container - .container
- .windows-docker-vs2019 - .windows-docker-vs2019
@@ -389,7 +389,7 @@ debian/arm_test:
windows_vs2019: windows_vs2019:
inherit: inherit:
default: false default: [retry]
extends: extends:
- .windows_container_build - .windows_container_build
variables: variables:
@@ -400,7 +400,7 @@ windows_vs2019:
windows_build_vs2019: windows_build_vs2019:
inherit: inherit:
default: false default: [retry]
extends: extends:
- .windows_container_build - .windows_container_build
rules: rules:
@@ -420,7 +420,7 @@ windows_build_vs2019:
windows_test_vs2019: windows_test_vs2019:
inherit: inherit:
default: false default: [retry]
extends: extends:
- .windows_container_build - .windows_container_build
rules: rules:
@@ -439,7 +439,7 @@ windows_test_vs2019:
.use-windows_build_vs2019: .use-windows_build_vs2019:
inherit: inherit:
default: false default: [retry]
extends: .windows-docker-vs2019 extends: .windows-docker-vs2019
image: "$MESA_IMAGE" image: "$MESA_IMAGE"
variables: variables:
@@ -450,7 +450,7 @@ windows_test_vs2019:
.use-windows_test_vs2019: .use-windows_test_vs2019:
inherit: inherit:
default: false default: [retry]
extends: .windows-docker-vs2019 extends: .windows-docker-vs2019
image: "$MESA_IMAGE" image: "$MESA_IMAGE"
variables: variables: