diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 21:08:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 21:08:54 +0000 |
commit | 36e363d33d5f75aeb75c552d4b325ed8c2d6105f (patch) | |
tree | 1ca97e2e47c613eed6b6cd4682c36c92067cab46 /scripts | |
parent | d91f5211693e913da5df110b8de841fad87e3653 (diff) | |
download | gitlab-ce-36e363d33d5f75aeb75c552d4b325ed8c2d6105f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/flaky_examples/detect-new-flaky-examples (renamed from scripts/detect-new-flaky-examples) | 0 | ||||
-rwxr-xr-x | scripts/flaky_examples/prune-old-flaky-examples (renamed from scripts/prune-old-flaky-specs) | 2 | ||||
-rw-r--r-- | scripts/rspec_helpers.sh | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/scripts/detect-new-flaky-examples b/scripts/flaky_examples/detect-new-flaky-examples index 3bee4f9a34b..3bee4f9a34b 100755 --- a/scripts/detect-new-flaky-examples +++ b/scripts/flaky_examples/detect-new-flaky-examples diff --git a/scripts/prune-old-flaky-specs b/scripts/flaky_examples/prune-old-flaky-examples index a00a334fd6e..7700b93438b 100755 --- a/scripts/prune-old-flaky-specs +++ b/scripts/flaky_examples/prune-old-flaky-examples @@ -24,5 +24,5 @@ puts "Current report has #{report.size} entries." new_report = report.prune_outdated -puts "New report has #{new_report.size} entries: #{report.size - new_report.size} entries older than 90 days were removed." +puts "New report has #{new_report.size} entries: #{report.size - new_report.size} entries older than #{RspecFlaky::Report::OUTDATED_DAYS_THRESHOLD} days were removed." puts "Saved #{new_report_file}." if new_report.write(new_report_file) diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 23e76980926..8762108066d 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -25,7 +25,7 @@ function update_tests_metadata() { 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}" + scripts/flaky_examples/prune-old-flaky-examples "${FLAKY_RSPEC_SUITE_REPORT_PATH}" if [[ -n ${TESTS_METADATA_S3_BUCKET} ]]; then scripts/sync-reports put "${TESTS_METADATA_S3_BUCKET}" "${FLAKY_RSPEC_SUITE_REPORT_PATH}" |