From 2c2bd00a6c2f4484ac7ba522b8d6b5fb64304a42 Mon Sep 17 00:00:00 2001 From: mfluharty Date: Thu, 18 Apr 2019 17:47:03 -0600 Subject: [PATCH] Make canceled jobs not retryable See which tests break --- app/models/ci/build.rb | 2 +- ...anceling-the-pipeline-and-manually-running-later-jobs.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs.yml diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5cf9bb4979a..8db2b05de9a 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -353,7 +353,7 @@ module Ci end def retryable? - !archived? && (success? || failed? || canceled?) + !archived? && (success? || failed?) end def retries_count diff --git a/changelogs/unreleased/53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs.yml b/changelogs/unreleased/53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs.yml new file mode 100644 index 00000000000..48f0a668982 --- /dev/null +++ b/changelogs/unreleased/53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs.yml @@ -0,0 +1,5 @@ +--- +title: Make canceled jobs not retryable +merge_request: 27503 +author: +type: changed