Merge branch 'junit-results' into 'master'

Enable JUnit results for rspec

See merge request gitlab-org/gitlab-ce!21449

.gitignore

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

.gitlab-ci.yml

@@ -171,7 +171,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"
+    - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml"
   artifacts:
     expire_in: 31d
     when: always
@@ -180,6 +180,8 @@ stages:
       - knapsack/
       - rspec_flaky/
       - tmp/capybara/
+    reports:
+      junit: junit_rspec.xml
 
 .rspec-metadata-pg: &rspec-metadata-pg
   <<: *rspec-metadata

Gemfile

@@ -389,6 +389,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

@@ -770,6 +770,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
@@ -1143,6 +1146,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

@@ -779,6 +779,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
@@ -1154,6 +1156,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)