Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 9 insertions, 13 deletions

diff --git a/app/services/ci/update_build_state_service.rb b/app/services/ci/update_build_state_service.rb
index 874f4bf459a..abd50d2f110 100644
--- a/app/services/ci/update_build_state_service.rb
+++ b/app/services/ci/update_build_state_service.rb
@@ -19,8 +19,6 @@ module Ci
     end
 
     def execute
-      overwrite_trace! if has_trace?
-
       unless accept_available?
         return update_build_state!
       end
@@ -34,12 +32,6 @@ module Ci
 
     private
 
-    def overwrite_trace!
-      metrics.increment_trace_operation(operation: :overwrite)
-
-      build.trace.set(params[:trace]) if Gitlab::Ci::Features.trace_overwrite?
-    end
-
     def ensure_pending_state!
       pending_state.created_at
     end
@@ -151,10 +143,6 @@ module Ci
       params.dig(:state).to_s
     end
 
-    def has_trace?
-      params.dig(:trace).present?
-    end
-
     def has_checksum?
       trace_checksum.present?
     end
@@ -181,7 +169,7 @@ module Ci
         state: params.fetch(:state),
         trace_checksum: trace_checksum,
         trace_bytesize: trace_bytesize,
-        failure_reason: params.dig(:failure_reason)
+        failure_reason: failure_reason
       )
 
       unless build_state.present?
@@ -191,6 +179,14 @@ module Ci
       build_state || build.pending_state
     end
 
+    def failure_reason
+      reason = params.dig(:failure_reason)
+
+      return unless reason
+
+      Ci::BuildPendingState.failure_reasons.fetch(reason.to_s, 'unknown_failure')
+    end
+
     ##
     # This method is releasing an exclusive lock on a build trace the moment we
     # conclude that build status has been written and the build state update