diff options
| -rw-r--r-- | buildscripts/burn_in_tests.py | 2 | ||||
| -rw-r--r-- | buildscripts/patch_builds/change_data.py | 16 | ||||
| -rw-r--r-- | buildscripts/selected_tests.py | 3 | ||||
| -rw-r--r-- | buildscripts/tests/patch_builds/test_change_data.py | 20 |
4 files changed, 15 insertions, 26 deletions
diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py index 5184e6b7293..6c7241961e4 100644 --- a/buildscripts/burn_in_tests.py +++ b/buildscripts/burn_in_tests.py @@ -220,7 +220,7 @@ def _create_revision_map(repos: List[Repo], origin_rev: Optional[str], evg_api: return generate_revision_map(repos, {"mongo": origin_rev}) if evg_api and task_id: - return generate_revision_map_from_manifest(repos, task_id, evg_api) + return generate_revision_map_from_manifest(repos) return {} diff --git a/buildscripts/patch_builds/change_data.py b/buildscripts/patch_builds/change_data.py index 11c98e8143a..42eca33abbb 100644 --- a/buildscripts/patch_builds/change_data.py +++ b/buildscripts/patch_builds/change_data.py @@ -38,22 +38,18 @@ def generate_revision_map(repos: List[Repo], revisions_data: Dict[str, str]) -> return {k: v for k, v in revision_map.items() if v} -def generate_revision_map_from_manifest(repos: List[Repo], task_id: str, - evg_api: EvergreenApi) -> RevisionMap: +def generate_revision_map_from_manifest(repos: List[Repo]) -> RevisionMap: """ Generate a revision map for the given repositories using the revisions from the manifest. :param repos: Repositories to generate map for. - :param task_id: Id of evergreen task running. - :param evg_api: Evergreen API object. :return: Map of repositories to revisions """ - manifest = evg_api.manifest_for_task(task_id) - revisions_data = { - module_name: module.revision - for module_name, module in manifest.modules.items() - } - revisions_data["mongo"] = manifest.revision + # This used to require hitting the manifest evergreen endpoint + # However, since we combined the enterprise and mongo repo we only care about a single commit + # which is the commit to the mongo repo which we can find by just finding the current git sha + revisions_data = {} + revisions_data["mongo"] = repos[0].head.commit.hexsha return generate_revision_map(repos, revisions_data) diff --git a/buildscripts/selected_tests.py b/buildscripts/selected_tests.py index dcdecccf531..c4621688cff 100644 --- a/buildscripts/selected_tests.py +++ b/buildscripts/selected_tests.py @@ -411,8 +411,7 @@ def run(evg_api: EvergreenApi, evg_conf: EvergreenProjectConfig, """ config_dict_of_suites_and_tasks = {} - task_id = selected_tests_variant_expansions[TASK_ID_EXPANSION] - revision_map = generate_revision_map_from_manifest(repos, task_id, evg_api) + revision_map = generate_revision_map_from_manifest(repos) changed_files = find_changed_files_in_repos(repos, revision_map) changed_files = {_remove_repo_path_prefix(file_path) for file_path in changed_files} LOGGER.debug("Found changed files", files=changed_files) diff --git a/buildscripts/tests/patch_builds/test_change_data.py b/buildscripts/tests/patch_builds/test_change_data.py index 531dea65569..0f46332e336 100644 --- a/buildscripts/tests/patch_builds/test_change_data.py +++ b/buildscripts/tests/patch_builds/test_change_data.py @@ -76,16 +76,10 @@ class TestGenerateRevisionMap(unittest.TestCase): class TestGenerateRevisionMapFromManifest(unittest.TestCase): def test_map_can_be_created_from_evergreen_api(self): - mock_repo_list = [create_mock_repo(os.getcwd()), create_mock_repo("/path/to/enterprise")] - mongo_revision = "revision1234" - enterprise_revision = "revision5678" - mock_manifest = MagicMock(revision=mongo_revision, - modules={"enterprise": MagicMock(revision=enterprise_revision)}) - mock_evg_api = MagicMock() - mock_evg_api.manifest_for_task.return_value = mock_manifest - - revision_map = under_test.generate_revision_map_from_manifest(mock_repo_list, "task_id", - mock_evg_api) - - self.assertEqual(revision_map[mock_repo_list[0].git_dir], mongo_revision) - self.assertEqual(revision_map[mock_repo_list[1].git_dir], enterprise_revision) + mock_repo_list = [create_mock_repo(os.getcwd())] + mock_repo_list[0].head.commit.hexsha = "revision1234" + + revision_map = under_test.generate_revision_map_from_manifest(mock_repo_list) + + self.assertEqual(revision_map[mock_repo_list[0].git_dir], + mock_repo_list[0].head.commit.hexsha) |