diff options
| -rw-r--r-- | lib/api/runner.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/ci/trace.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 59898cd2477..5b7ae89440c 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -132,9 +132,9 @@ module API case params[:state].to_s when 'success' - job.success + job.success! when 'failed' - job.drop(params[:failure_reason] || :unknown_failure) + job.drop!(params[:failure_reason] || :unknown_failure) end end diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb index 30e3b523470..fe15fabc2e8 100644 --- a/lib/gitlab/ci/trace.rb +++ b/lib/gitlab/ci/trace.rb @@ -59,7 +59,9 @@ module Gitlab def read stream = Gitlab::Ci::Trace::Stream.new do - if job.trace_chunks.any? + if trace_artifact + trace_artifact.open + elsif job.trace_chunks.any? Gitlab::Ci::Trace::ChunkedIO.new(job) elsif current_path File.open(current_path, "rb") @@ -75,9 +77,7 @@ module Gitlab def write(mode) stream = Gitlab::Ci::Trace::Stream.new do - if trace_artifact - # no op. It's already archived. - elsif current_path + if current_path File.open(current_path, mode) elsif Feature.enabled?('ci_enable_live_trace') Gitlab::Ci::Trace::ChunkedIO.new(job) |