diff options
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | qa/Gemfile | 1 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 3 | ||||
| -rw-r--r-- | qa/qa/specs/features/api/3_create/repository/files_spec.rb | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index f5ed3e1ad9a..39664834cc0 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -143,6 +143,8 @@ review-stop: dependencies: - review-deploy artifacts: + reports: + junit: qa/**/junit_rspec.xml paths: - ./qa/gitlab-qa-run-* expire_in: 7 days @@ -164,12 +166,17 @@ review-qa-smoke: review-qa-all: <<: *review-qa-base allow_failure: true - when: manual parallel: 5 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}" -- --format json --out tmp/reports/rspec.json --format documentation + +review-qa-all-1: + <<: *review-qa-base + allow_failure: true + script: + - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" -- --format json --out tmp/reports/rspec.json --format documentation .review-performance-base: &review-performance-base <<: *review-qa-base diff --git a/qa/Gemfile b/qa/Gemfile index 12994b85322..3c8486c790b 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -5,6 +5,7 @@ gem 'capybara', '~> 2.16.1' gem 'capybara-screenshot', '~> 1.0.18' gem 'rake', '~> 12.3.0' gem 'rspec', '~> 3.7' +gem "rspec_junit_formatter", "~> 0.4.1" gem 'selenium-webdriver', '~> 3.12' gem 'airborne', '~> 0.2.13' gem 'nokogiri', '~> 1.10.3' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 6b0635ed0e2..bdc9cbd713c 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -83,6 +83,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) @@ -110,6 +112,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 diff --git a/qa/qa/specs/features/api/3_create/repository/files_spec.rb b/qa/qa/specs/features/api/3_create/repository/files_spec.rb index f6f020da472..2a4f76f5d86 100644 --- a/qa/qa/specs/features/api/3_create/repository/files_spec.rb +++ b/qa/qa/specs/features/api/3_create/repository/files_spec.rb @@ -3,7 +3,7 @@ require 'securerandom' module QA - describe 'API basics' do + describe 'API basics', :quarantine do before(:context) do @api_client = Runtime::API::Client.new(:gitlab) end |