diff options
| author | Mikhail Shchatko <mikhail.shchatko@mongodb.com> | 2021-09-07 11:59:46 +0300 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-07 13:33:41 +0000 |
| commit | 3efab32e8e186253792aeaf462f424315a08aa3a (patch) | |
| tree | 6ae21237e35a1383f7ea9de8dd701c8be86a1e71 /buildscripts | |
| parent | d1363de83fa77578720f71849780cedf083cee1b (diff) | |
| download | mongo-3efab32e8e186253792aeaf462f424315a08aa3a.tar.gz | |
SERVER-59809 Use project_identifier instead of project_id in setup multiversion
Diffstat (limited to 'buildscripts')
3 files changed, 4 insertions, 4 deletions
diff --git a/buildscripts/resmokelib/setup_multiversion/setup_multiversion.py b/buildscripts/resmokelib/setup_multiversion/setup_multiversion.py index 739e053fe82..4c12ff32708 100644 --- a/buildscripts/resmokelib/setup_multiversion/setup_multiversion.py +++ b/buildscripts/resmokelib/setup_multiversion/setup_multiversion.py @@ -128,7 +128,7 @@ class SetupMultiversion(Subcommand): " version.") urls = self.get_urls(version) - bin_suffix = self._get_bin_suffix(version, urls["project_id"]) + bin_suffix = self._get_bin_suffix(version, urls["project_identifier"]) # Give each version a unique install dir install_dir = os.path.join(self.install_dir, version) diff --git a/buildscripts/resmokelib/utils/evergreen_conn.py b/buildscripts/resmokelib/utils/evergreen_conn.py index 5cdb6774dc1..c328e06c6de 100644 --- a/buildscripts/resmokelib/utils/evergreen_conn.py +++ b/buildscripts/resmokelib/utils/evergreen_conn.py @@ -193,7 +193,7 @@ def _get_multiversion_urls(tasks_wrapper): archive_symbols_task=f"{EVERGREEN_HOST}/task/{symbols.task_id}") # Tack on the project id for generating a friendly decompressed name for the artifacts. - compile_artifact_urls["project_id"] = binary.project_id + compile_artifact_urls["project_identifier"] = binary.project_identifier elif all(task for task in required_tasks): LOGGER.warning("Required Evergreen task(s) were not successful.", diff --git a/buildscripts/tests/resmokelib/utils/test_evergreen_conn.py b/buildscripts/tests/resmokelib/utils/test_evergreen_conn.py index e95841b0caa..772c570ea52 100644 --- a/buildscripts/tests/resmokelib/utils/test_evergreen_conn.py +++ b/buildscripts/tests/resmokelib/utils/test_evergreen_conn.py @@ -150,12 +150,12 @@ class TestGetCompileArtifactUrls(unittest.TestCase): def test_urls_found(self, mock_evg_api, mock_version, mock_build, mock_compile_task, mock_push_task, mock_artifact): - mock_compile_task.project_id = "dummy project id" + mock_compile_task.project_identifier = "dummy project id" expected_urls = { "Binaries": "https://mciuploads.s3.amazonaws.com/mongodb-mongo-master/ubuntu1804/90f767adbb1901d007ee4dd8714f53402d893669/binaries/mongo-mongodb_mongo_master_ubuntu1804_90f767adbb1901d007ee4dd8714f53402d893669_20_11_30_03_14_30.tgz", - "project_id": + "project_identifier": "dummy project id" } mock_evg_api.build_by_id.return_value = mock_build |