diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 15:07:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 15:07:23 +0000 |
| commit | 4938925517ffb73a07fbf55972ea415bd90ea342 (patch) | |
| tree | c0258ddd137ce50265050b19c46659d59e6b76c8 /scripts/rspec_helpers.sh | |
| parent | f2fd07aa1c0bfb732b80c3d028cd23c91547991c (diff) | |
| download | gitlab-ce-4938925517ffb73a07fbf55972ea415bd90ea342.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/rspec_helpers.sh')
| -rw-r--r-- | scripts/rspec_helpers.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 3c96635896e..20faa9acaa9 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -11,7 +11,6 @@ function retrieve_tests_metadata() { if [[ ! -f "${FLAKY_RSPEC_SUITE_REPORT_PATH}" ]]; then curl --location -o "${FLAKY_RSPEC_SUITE_REPORT_PATH}" "https://gitlab-org.gitlab.io/gitlab/${FLAKY_RSPEC_SUITE_REPORT_PATH}" || - curl --location -o "${FLAKY_RSPEC_SUITE_REPORT_PATH}" "https://gitlab-org.gitlab.io/gitlab/rspec_flaky/report-suite.json" || # temporary back-compat echo "{}" > "${FLAKY_RSPEC_SUITE_REPORT_PATH}" fi else @@ -35,13 +34,7 @@ function retrieve_tests_metadata() { if [[ ! -f "${FLAKY_RSPEC_SUITE_REPORT_PATH}" ]]; then scripts/api/download_job_artifact.rb --endpoint "https://gitlab.com/api/v4" --project "${project_path}" --job-id "${test_metadata_job_id}" --artifact-path "${FLAKY_RSPEC_SUITE_REPORT_PATH}" || - scripts/api/download_job_artifact.rb --endpoint "https://gitlab.com/api/v4" --project "${project_path}" --job-id "${test_metadata_job_id}" --artifact-path "rspec_flaky/report-suite.json" || # temporary back-compat echo "{}" > "${FLAKY_RSPEC_SUITE_REPORT_PATH}" - - # temporary back-compat - if [[ -f "rspec_flaky/report-suite.json" ]]; then - mv "rspec_flaky/report-suite.json" "${FLAKY_RSPEC_SUITE_REPORT_PATH}" - fi fi else echo "test_metadata_job_id couldn't be found!" |