summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeff Morgan <zmorgan@gitlab.com>2019-07-17 13:27:41 -0400
committerZeff Morgan <zmorgan@gitlab.com>2019-07-17 13:27:41 -0400
commitf12f664a5ebdb2918bfcfd68d4974dbe69940181 (patch)
treeb7d1fe9e12d1891c5716d6931c937f058eb9eb84
parent2860cfaaff0a435792081b72a5f97de85e0d4f70 (diff)
downloadgitlab-ce-zm-junit-reports.tar.gz
Add junit artifacts and remove profilingzm-junit-reports
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml2
-rw-r--r--qa/Gemfile1
-rw-r--r--qa/Gemfile.lock3
3 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index ce019de213b..26b18aaffd7 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -174,7 +174,7 @@ review-qa-all:
script:
- export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/review-qa-all_master_report.json
- export KNAPSACK_TEST_FILE_PATTERN=qa/specs/features/**/*_spec.rb
- - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}"
+ - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" -- --no-profile --format RspecJunitFormatter --out tmp/rspec-${CI_JOB_ID}.xml
.review-performance-base: &review-performance-base
<<: *review-qa-base
diff --git a/qa/Gemfile b/qa/Gemfile
index c46be8a0362..53e7cc497e2 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -10,6 +10,7 @@ gem 'selenium-webdriver', '~> 3.12'
gem 'airborne', '~> 0.2.13'
gem 'nokogiri', '~> 1.10.3'
gem 'rspec-retry', '~> 0.6.1'
+gem 'rspec_junit_formatter', '~> 0.4.1'
gem 'faker', '~> 1.6', '>= 1.6.6'
gem 'knapsack', '~> 1.17'
gem 'parallel_tests', '~> 2.29'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 73aabf2c6ad..2bcf7c3b999 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -87,6 +87,8 @@ GEM
rspec-retry (0.6.1)
rspec-core (> 3.3)
rspec-support (3.7.0)
+ rspec_junit_formatter (0.4.1)
+ rspec-core (>= 2, < 4, != 2.12.0)
rubyzip (1.2.2)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
@@ -116,6 +118,7 @@ DEPENDENCIES
rake (~> 12.3.0)
rspec (~> 3.7)
rspec-retry (~> 0.6.1)
+ rspec_junit_formatter (~> 0.4.1)
selenium-webdriver (~> 3.12)
BUNDLED WITH