diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-22 12:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-22 12:09:45 +0300 |
| commit | b81fd57f3d62db4455108c8de4b8d7b8d403de35 (patch) | |
| tree | d6750edadd7a35bb6719a28f8a56b4e4174a340a /scripts/rspec_helpers.sh | |
| parent | d17c58402b28c7eabe74df21b57ae31beec56b1f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/rspec_helpers.sh')
| -rw-r--r-- | scripts/rspec_helpers.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 0b109ba0fb3..e53c55a54ea 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -3,11 +3,14 @@ function retrieve_tests_metadata() { mkdir -p knapsack/ rspec_flaky/ rspec_profiling/ + # ${CI_DEFAULT_BRANCH} might not be master in other forks but we want to + # always target the canonical project here, so the branch must be hardcoded local project_path="gitlab-org/gitlab" + local artifact_branch="master" local test_metadata_job_id # Ruby - test_metadata_job_id=$(scripts/api/get_job_id.rb --project "${project_path}" -q "status=success" -q "ref=${CI_DEFAULT_BRANCH}" -q "username=gitlab-bot" -Q "scope=success" --job-name "update-tests-metadata") + test_metadata_job_id=$(scripts/api/get_job_id.rb --project "${project_path}" -q "status=success" -q "ref=${artifact_branch}" -q "username=gitlab-bot" -Q "scope=success" --job-name "update-tests-metadata") if [[ ! -f "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" ]]; then scripts/api/download_job_artifact.rb --project "${project_path}" --job-id "${test_metadata_job_id}" --artifact-path "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" || echo "{}" > "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" |