Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 21 insertions, 0 deletions

diff --git a/app/services/ci/process_build_service.rb b/app/services/ci/process_build_service.rb
index 12cdca24066..dd7b562cdb7 100644
--- a/app/services/ci/process_build_service.rb
+++ b/app/services/ci/process_build_service.rb
@@ -26,6 +26,27 @@ module Ci
     end
 
     def valid_statuses_for_build(build)
+      if ::Feature.enabled?(:skip_dag_manual_and_delayed_jobs, default_enabled: :yaml)
+        current_valid_statuses_for_build(build)
+      else
+        legacy_valid_statuses_for_build(build)
+      end
+    end
+
+    def current_valid_statuses_for_build(build)
+      case build.when
+      when 'on_success', 'manual', 'delayed'
+        build.scheduling_type_dag? ? %w[success] : %w[success skipped]
+      when 'on_failure'
+        %w[failed]
+      when 'always'
+        %w[success failed skipped]
+      else
+        []
+      end
+    end
+
+    def legacy_valid_statuses_for_build(build)
       case build.when
       when 'on_success'
         build.scheduling_type_dag? ? %w[success] : %w[success skipped]