Commit ea0528bd authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'fix-subtransaction-retry-build' into 'master'

Do not auto-retry unrecoverable `missing_dependency_failure` job failure

See merge request gitlab-org/gitlab!70889
parents 35967000 d6870c2b
...@@ -851,10 +851,6 @@ ...@@ -851,10 +851,6 @@
"const": "runner_system_failure", "const": "runner_system_failure",
"description": "Retry if there is a runner system failure (for example, job setup failed)." "description": "Retry if there is a runner system failure (for example, job setup failed)."
}, },
{
"const": "missing_dependency_failure",
"description": "Retry if a dependency is missing."
},
{ {
"const": "runner_unsupported", "const": "runner_unsupported",
"description": "Retry if the runner is unsupported." "description": "Retry if the runner is unsupported."
......
...@@ -3405,7 +3405,6 @@ Possible values for `when` are: ...@@ -3405,7 +3405,6 @@ Possible values for `when` are:
- `api_failure`: Retry on API failure. - `api_failure`: Retry on API failure.
- `stuck_or_timeout_failure`: Retry when the job got stuck or timed out. - `stuck_or_timeout_failure`: Retry when the job got stuck or timed out.
- `runner_system_failure`: Retry if there is a runner system failure (for example, job setup failed). - `runner_system_failure`: Retry if there is a runner system failure (for example, job setup failed).
- `missing_dependency_failure`: Retry if a dependency is missing.
- `runner_unsupported`: Retry if the runner is unsupported. - `runner_unsupported`: Retry if the runner is unsupported.
- `stale_schedule`: Retry if a delayed job could not be executed. - `stale_schedule`: Retry if a delayed job could not be executed.
- `job_execution_timeout`: Retry if the script exceeded the maximum execution time set for the job. - `job_execution_timeout`: Retry if the script exceeded the maximum execution time set for the job.
......
...@@ -9,7 +9,8 @@ class Gitlab::Ci::Build::AutoRetry ...@@ -9,7 +9,8 @@ class Gitlab::Ci::Build::AutoRetry
RETRY_OVERRIDES = { RETRY_OVERRIDES = {
ci_quota_exceeded: 0, ci_quota_exceeded: 0,
no_matching_runner: 0 no_matching_runner: 0,
missing_dependency_failure: 0
}.freeze }.freeze
def initialize(build) def initialize(build)
......
...@@ -24,6 +24,7 @@ RSpec.describe Gitlab::Ci::Build::AutoRetry do ...@@ -24,6 +24,7 @@ RSpec.describe Gitlab::Ci::Build::AutoRetry do
"default for scheduler failure" | 1 | {} | :scheduler_failure | true "default for scheduler failure" | 1 | {} | :scheduler_failure | true
"quota is exceeded" | 0 | { max: 2 } | :ci_quota_exceeded | false "quota is exceeded" | 0 | { max: 2 } | :ci_quota_exceeded | false
"no matching runner" | 0 | { max: 2 } | :no_matching_runner | false "no matching runner" | 0 | { max: 2 } | :no_matching_runner | false
"missing dependencies" | 0 | { max: 2 } | :missing_dependency_failure | false
end end
with_them do with_them do
......
...@@ -101,7 +101,6 @@ RSpec.describe Gitlab::Ci::Config::Entry::Retry do ...@@ -101,7 +101,6 @@ RSpec.describe Gitlab::Ci::Config::Entry::Retry do
api_failure api_failure
stuck_or_timeout_failure stuck_or_timeout_failure
runner_system_failure runner_system_failure
missing_dependency_failure
runner_unsupported runner_unsupported
stale_schedule stale_schedule
job_execution_timeout job_execution_timeout
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment