Expose current_path

2 files changed, 11 insertions, 9 deletions

diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb
index 841168438d8..4c814c6f501 100644
--- a/app/uploaders/job_artifact_uploader.rb
+++ b/app/uploaders/job_artifact_uploader.rb
@@ -14,9 +14,11 @@ class JobArtifactUploader < GitlabUploader
   end
 
   def open
-    raise 'Only File System is supported' unless file_storage?
-
-    File.open(path) if path
+    if file_storage?
+      File.open(path, "rb")
+    else
+      raise 'Only File System is supported'
+    end
   end
 
   private
diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index 27f5869770e..307e3bf1c8f 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -101,6 +101,12 @@ module Gitlab
         job.erase_old_trace!
       end
 
+      def current_path
+        @current_path ||= paths.find do |trace_path|
+          File.exist?(trace_path)
+        end
+      end
+
       private
 
       def ensure_path
@@ -116,12 +122,6 @@ module Gitlab
         end
       end
 
-      def current_path
-        @current_path ||= paths.find do |trace_path|
-          File.exist?(trace_path)
-        end
-      end
-
       ##
       # This method doesn't include the latest path, which is JobArtifactUploader#default_path,
       # Because, in EE, traces can be moved to ObjectStorage, so checking paths in Filestorage doesn't make sense.