Commit a98a462f authored by Shinya Maeda's avatar Shinya Maeda

Revert correctly

parent db55fa59
...@@ -132,9 +132,9 @@ module API ...@@ -132,9 +132,9 @@ module API
case params[:state].to_s case params[:state].to_s
when 'success' when 'success'
job.success job.success!
when 'failed' when 'failed'
job.drop(params[:failure_reason] || :unknown_failure) job.drop!(params[:failure_reason] || :unknown_failure)
end end
end end
......
...@@ -59,7 +59,9 @@ module Gitlab ...@@ -59,7 +59,9 @@ module Gitlab
def read def read
stream = Gitlab::Ci::Trace::Stream.new do 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) Gitlab::Ci::Trace::ChunkedIO.new(job)
elsif current_path elsif current_path
File.open(current_path, "rb") File.open(current_path, "rb")
...@@ -75,9 +77,7 @@ module Gitlab ...@@ -75,9 +77,7 @@ module Gitlab
def write(mode) def write(mode)
stream = Gitlab::Ci::Trace::Stream.new do stream = Gitlab::Ci::Trace::Stream.new do
if trace_artifact if current_path
# no op. It's already archived.
elsif current_path
File.open(current_path, mode) File.open(current_path, mode)
elsif Feature.enabled?('ci_enable_live_trace') elsif Feature.enabled?('ci_enable_live_trace')
Gitlab::Ci::Trace::ChunkedIO.new(job) Gitlab::Ci::Trace::ChunkedIO.new(job)
......
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