Commit 42592201 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Hotfix for builds trace data integrity

Issue #4246
parent 517d885b38bb
...@@ -194,8 +194,11 @@ def extract_coverage(text, regex) ...@@ -194,8 +194,11 @@ def extract_coverage(text, regex)
end end
def raw_trace def raw_trace
if File.exist?(path_to_trace) if File.file?(path_to_trace)
File.read(path_to_trace) File.read(path_to_trace)
elsif File.file?(old_path_to_trace)
# Temporary fix for build trace data integrity
File.read(old_path_to_trace)
else else
# backward compatibility # backward compatibility
read_attribute :trace read_attribute :trace
...@@ -231,6 +234,24 @@ def path_to_trace ...@@ -231,6 +234,24 @@ def path_to_trace
"#{dir_to_trace}/#{id}.log" "#{dir_to_trace}/#{id}.log"
end end
##
# Deprecated
#
def old_dir_to_trace
File.join(
Settings.gitlab_ci.builds_path,
created_at.utc.strftime("%Y_%m"),
project.ci_id.to_s
)
end
##
# Deprecated
#
def old_path_to_trace
"#{old_dir_to_trace}/#{id}.log"
end
def token def token
project.runners_token project.runners_token
end end
......
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