From d378fdaa60adb7217e3fc798580ad206127728d5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Sep 2021 12:10:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- scripts/rspec_helpers.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'scripts/rspec_helpers.sh') diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index f3e00ce3d1c..797d9188f81 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -63,9 +63,7 @@ function retrieve_tests_mapping() { local artifact_branch="master" local test_metadata_with_mapping_job_id - # FIXME: retrieving job id is failing https://gitlab.com/gitlab-org/gitlab/-/issues/340706 - # test_metadata_with_mapping_job_id=$(scripts/api/get_job_id.rb --endpoint "https://gitlab.com/api/v4" --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") - test_metadata_with_mapping_job_id="1583877936" + test_metadata_with_mapping_job_id=$(scripts/api/get_job_id.rb --endpoint "https://gitlab.com/api/v4" --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 --endpoint "https://gitlab.com/api/v4" --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}" -- cgit v1.2.1