From 8a89efd87a137634381a93c45c05e587eb207b94 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Thu, 25 Jan 2018 22:46:38 +0900
Subject: [PATCH] Remove unnecessary changes

---
 lib/gitlab/ci/trace.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb
index a6827d7a38a..d7d4b02b516 100644
--- a/lib/gitlab/ci/trace.rb
+++ b/lib/gitlab/ci/trace.rb
@@ -84,6 +84,8 @@ module Gitlab
       end
 
       def erase!
+        job.job_artifacts_trace&.destory
+
         paths.each do |trace_path|
           FileUtils.rm(trace_path, force: true)
         end
@@ -106,6 +108,14 @@ module Gitlab
         end
       end
 
+      def current_path
+        @current_path ||= paths.find do |trace_path|
+          File.exist?(trace_path)
+        end
+      end
+
+      ##
+      # This doesn't include the latest path JobArtifactUploader#default_path.
       def paths
         [
           default_path,
@@ -113,12 +123,6 @@ module Gitlab
         ].compact
       end
 
-      def current_path
-        @current_path ||= paths.find do |trace_path|
-          File.exist?(trace_path)
-        end
-      end
-
       def default_directory
         File.join(
           Settings.gitlab_ci.builds_path,