Merge branch 'junit-results-ee' into 'master'

EE: Enable JUnit results for rspec

See merge request gitlab-org/gitlab-ee!7207

.gitignore

@@ -77,3 +77,4 @@ eslint-report.html
 /plugins/*
 /.gitlab_pages_secret
 package-lock.json
+/junit_rspec.xml

.gitlab-ci.yml

@@ -201,7 +201,7 @@ stages:
     - '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}'
     - '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}'
     - scripts/gitaly-test-spawn
-    - knapsack rspec "--color --format documentation --tag ~geo"
+    - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag ~geo"
   artifacts:
     expire_in: 31d
     when: always
@@ -210,6 +210,8 @@ stages:
       - knapsack/
       - rspec_flaky/
       - tmp/capybara/
+    reports:
+      junit: junit_rspec.xml
 
 .rspec-metadata-pg: &rspec-metadata-pg
   <<: *rspec-metadata
@@ -237,7 +239,10 @@ stages:
     - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${JOB_NAME[0]}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
     - cp ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
     - scripts/gitaly-test-spawn
-    - knapsack rspec "-Ispec --color --format documentation --tag ~geo"
+    - knapsack rspec "-Ispec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag ~geo"
+  artifacts:
+    reports:
+      junit: junit_rspec.xml
 
 .rspec-ee-pg: &rspec-ee-pg
   <<: *rspec-metadata-ee
@@ -256,7 +261,10 @@ stages:
     - export CACHE_CLASSES=true
     - source scripts/prepare_postgres_fdw.sh
     - scripts/gitaly-test-spawn
-    - bundle exec rspec --color --format documentation --tag geo ee/spec/
+    - bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/
+  artifacts:
+    reports:
+      junit: junit_rspec.xml
 
 .rspec-geo-pg-10-2: &rspec-metadata-pg-geo-10-2
   <<: *rspec-metadata
@@ -267,7 +275,10 @@ stages:
     - export CACHE_CLASSES=true
     - source scripts/prepare_postgres_fdw.sh
     - scripts/gitaly-test-spawn
-    - bundle exec rspec --color --format documentation --tag geo ee/spec/
+    - bundle exec rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo ee/spec/
+  artifacts:
+    reports:
+      junit: junit_rspec.xml
 
 .rspec-ee-pg-rails5: &rspec-ee-pg-rails5
   <<: *rspec-ee-pg

Gemfile

@@ -401,6 +401,7 @@ group :test do
   gem 'sham_rack', '~> 1.3.6'
   gem 'concurrent-ruby', '~> 1.0.5'
   gem 'test-prof', '~> 0.2.5'
+  gem 'rspec_junit_formatter'
 end
 
 gem 'octokit', '~> 4.9'

Gemfile.lock

@@ -799,6 +799,9 @@ GEM
       rspec-core
     rspec-set (0.1.3)
     rspec-support (3.7.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rspec_profiling (0.0.5)
       activerecord
       pg
@@ -1180,6 +1183,7 @@ DEPENDENCIES
   rspec-rails (~> 3.7.0)
   rspec-retry (~> 0.4.5)
   rspec-set (~> 0.1.3)
+  rspec_junit_formatter
   rspec_profiling (~> 0.0.5)
   rubocop (~> 0.54.0)
   rubocop-rspec (~> 1.22.1)

Gemfile.rails5.lock

@@ -808,6 +808,8 @@ GEM
       rspec-core
     rspec-set (0.1.3)
     rspec-support (3.7.1)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rspec_profiling (0.0.5)
       activerecord
       pg
@@ -1191,6 +1193,7 @@ DEPENDENCIES
   rspec-rails (~> 3.7.0)
   rspec-retry (~> 0.4.5)
   rspec-set (~> 0.1.3)
+  rspec_junit_formatter
   rspec_profiling (~> 0.0.5)
   rubocop (~> 0.54.0)
   rubocop-rspec (~> 1.22.1)