diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 15:05:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 15:05:59 +0300 |
| commit | 9e27f0d920cc3891fa7644c5cc0bc280c519fb20 (patch) | |
| tree | 9784dd99270f2009159b19077412bf83d13123a4 /scripts | |
| parent | 1bab0ba591263cd739af2d2c7c3f1b03678a59b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rspec_helpers.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index a959ae0549d..9c9d33235c9 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -15,14 +15,14 @@ function retrieve_tests_metadata() { function update_tests_metadata() { echo "{}" > "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" - scripts/merge-reports "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" "knapsack/rspec*_pg9_*.json" + scripts/merge-reports "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" knapsack/rspec*_pg9_*.json if [[ -n "${TESTS_METADATA_S3_BUCKET}" ]]; then scripts/sync-reports put "${TESTS_METADATA_S3_BUCKET}" "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" fi - rm -f "knapsack/rspec*.json" + rm -f knapsack/rspec*.json - scripts/merge-reports "${FLAKY_RSPEC_SUITE_REPORT_PATH}" "rspec_flaky/all_*.json" + scripts/merge-reports "${FLAKY_RSPEC_SUITE_REPORT_PATH}" rspec_flaky/all_*.json export FLAKY_RSPEC_GENERATE_REPORT="1" scripts/prune-old-flaky-specs "${FLAKY_RSPEC_SUITE_REPORT_PATH}" @@ -31,7 +31,7 @@ function update_tests_metadata() { scripts/sync-reports put "${TESTS_METADATA_S3_BUCKET}" "${FLAKY_RSPEC_SUITE_REPORT_PATH}" fi - rm -f "rspec_flaky/all_*.json" "rspec_flaky/new_*.json" + rm -f rspec_flaky/all_*.json rspec_flaky/new_*.json scripts/insert-rspec-profiling-data } |