diff options
author | Zeff Morgan <zmorgan@gitlab.com> | 2019-07-24 13:57:59 -0400 |
---|---|---|
committer | Zeff Morgan <zmorgan@gitlab.com> | 2019-07-24 13:57:59 -0400 |
commit | 18915ada74fe0d36b3499c46f1dd929421fd784a (patch) | |
tree | 3cbbdd0c64071a9bcd6bd29e1eb0bc5a23c70a54 | |
parent | d86ef0b00f9a21d07db513d3e4e9311add25075c (diff) | |
download | gitlab-ce-zm-review-logs.tar.gz |
Simplify log formatzm-review-logs
-rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | qa/Gemfile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 41d52c4e095..10b80724ca8 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}" -- --format RspecJunitFormatter --out tmp/rspec-${CI_JOB_ID}.xml --format html --out tmp/rspec.htm --color --format documentation + - gitlab-qa Test::Instance::Any "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" -- --format RspecJunitFormatter --out tmp/rspec-${CI_JOB_ID}.xml --format html --out tmp/rspec.htm --color --format Fivemat parallel-spec-reports: extends: .dedicated-runner diff --git a/qa/Gemfile b/qa/Gemfile index 53e7cc497e2..8c8b56118a3 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -11,6 +11,7 @@ gem 'airborne', '~> 0.2.13' gem 'nokogiri', '~> 1.10.3' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_junit_formatter', '~> 0.4.1' +gem 'fivemat' gem 'faker', '~> 1.6', '>= 1.6.6' gem 'knapsack', '~> 1.17' gem 'parallel_tests', '~> 2.29' |