From 9a6ce792bb4d953f69391c2799afd35bd02b2904 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Sun, 28 Feb 2021 03:59:14 +0000 Subject: [PATCH] Unify the Rspec options into a single pattern Signed-off-by: Takuya Noguchi --- .rspec | 2 +- gitlab-ci-config/gitlab-com.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.rspec b/.rspec index 4e1e0d2f7..0e371a416 100644 --- a/.rspec +++ b/.rspec @@ -1 +1 @@ ---color +--color --format RspecJunitFormatter --out junit_rspec.xml --format documentation diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml index 83f3c61db..39d54d1e2 100644 --- a/gitlab-ci-config/gitlab-com.yml +++ b/gitlab-ci-config/gitlab-com.yml @@ -175,7 +175,7 @@ <<: *com-except-triggers-docs-and-deps retry: 1 script: - - bundle exec rspec --color --format RspecJunitFormatter --out junit_rspec.xml --format documentation spec/lib + - bundle exec rspec spec/lib artifacts: reports: &spec_reports junit: junit_rspec.xml @@ -197,7 +197,7 @@ - cp knapsack/${DISTRO_NAME}_${DISTRO_VERSION}_main_rspec_report.json ${KNAPSACK_REPORT_PATH}.bak - rm -f knapsack/*.json - mv ${KNAPSACK_REPORT_PATH}.bak ${KNAPSACK_REPORT_PATH} - - bundle exec rake "knapsack:rspec[--color --format RspecJunitFormatter --out junit_rspec.xml --format documentation]" + - bundle exec rake knapsack:rspec artifacts: <<: *knapsack-artifacts reports: