Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-03 03:09:49 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-03 03:09:49 +0300
commitd7940ee9f8b94e68cb8c56730b65a47b85e622b2 (patch)
tree508cb9b26126f4e3124e9ce08cd4a4c0a5c88a3e /lib/gitlab/ci/parsers
parente2191b0a18b1fc6b7a70c60cdc31277883095742 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/parsers')
-rw-r--r--lib/gitlab/ci/parsers/test/junit.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/gitlab/ci/parsers/test/junit.rb b/lib/gitlab/ci/parsers/test/junit.rb
index a5cea386b34..364ae66844e 100644
--- a/lib/gitlab/ci/parsers/test/junit.rb
+++ b/lib/gitlab/ci/parsers/test/junit.rb
@@ -66,12 +66,10 @@ module Gitlab
status = ::Gitlab::Ci::Reports::TestCase::STATUS_FAILED
system_output = data['failure']
attachment = attachment_path(data['system_out'])
- attachment = remove_project_prefix(attachment, job)
elsif data.key?('error')
status = ::Gitlab::Ci::Reports::TestCase::STATUS_ERROR
system_output = data['error']
attachment = attachment_path(data['system_out'])
- attachment = remove_project_prefix(attachment, job)
elsif data.key?('skipped')
status = ::Gitlab::Ci::Reports::TestCase::STATUS_SKIPPED
system_output = data['skipped']
@@ -103,10 +101,6 @@ module Gitlab
matches = data.match(ATTACHMENT_TAG_REGEX)
matches[:path] if matches
end
-
- def remove_project_prefix(attachment, job)
- attachment&.delete_prefix(job.variables['CI_PROJECT_DIR']&.value || '')
- end
end
end
end