Merge branch 'hard-code-artifact-branch-2' into 'master'

(Again) Make sure we're targeting the right branch in the canonical project when retrieving test_metadata_job_id

See merge request gitlab-org/gitlab!60099

scripts/rspec_helpers.sh

@@ -42,10 +42,13 @@ function update_tests_metadata() {
 function retrieve_tests_mapping() {
   mkdir -p crystalball/
 
+  # ${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_with_mapping_job_id
 
-  test_metadata_with_mapping_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" --artifact-path "${RSPEC_PACKED_TESTS_MAPPING_PATH}.gz")
+  test_metadata_with_mapping_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" --artifact-path "${RSPEC_PACKED_TESTS_MAPPING_PATH}.gz")
 
   if [[ ! -f "${RSPEC_PACKED_TESTS_MAPPING_PATH}" ]]; then
    (scripts/api/download_job_artifact.rb --project "${project_path}" --job-id "${test_metadata_with_mapping_job_id}" --artifact-path "${RSPEC_PACKED_TESTS_MAPPING_PATH}.gz" && gzip -d "${RSPEC_PACKED_TESTS_MAPPING_PATH}.gz") || echo "{}" > "${RSPEC_PACKED_TESTS_MAPPING_PATH}"