diff options
author | David Bradford <david.bradford@mongodb.com> | 2020-12-03 08:49:19 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-12-04 21:53:06 +0000 |
commit | f946a64ec3cadae717759479ddeaea368c5a6b1c (patch) | |
tree | 890235956574ea0e44aee280cce2e685524c106f /buildscripts/evergreen_gen_multiversion_tests.py | |
parent | 57ef9399e10fd4cd2b8100e105137bcfda20f7d2 (diff) | |
download | mongo-f946a64ec3cadae717759479ddeaea368c5a6b1c.tar.gz |
SERVER-53196: Fail to generate tasks if a large distro is required but not specified
Diffstat (limited to 'buildscripts/evergreen_gen_multiversion_tests.py')
-rwxr-xr-x | buildscripts/evergreen_gen_multiversion_tests.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/buildscripts/evergreen_gen_multiversion_tests.py b/buildscripts/evergreen_gen_multiversion_tests.py index 9ad5db4b9e6..11e3f64a93f 100755 --- a/buildscripts/evergreen_gen_multiversion_tests.py +++ b/buildscripts/evergreen_gen_multiversion_tests.py @@ -19,11 +19,9 @@ import structlog from evergreen.api import RetryingEvergreenApi, EvergreenApi from shrub.v2 import ShrubProject, FunctionCall, Task, TaskDependency, BuildVariant, ExistingTask -from buildscripts.resmokelib import config as _config from buildscripts.resmokelib.multiversionconstants import (LAST_LTS_MONGO_BINARY, REQUIRES_FCV_TAG) -import buildscripts.resmokelib.parser import buildscripts.util.taskname as taskname -from buildscripts.util.fileops import write_file_to_dir +from buildscripts.util.fileops import write_file_to_dir, read_yaml_file import buildscripts.evergreen_generate_resmoke_tasks as generate_resmoke from buildscripts.evergreen_generate_resmoke_tasks import Suite, ConfigOptions import buildscripts.evergreen_gen_fuzzer_tests as gen_fuzzer @@ -42,7 +40,7 @@ DEFAULT_CONFIG_VALUES = generate_resmoke.DEFAULT_CONFIG_VALUES CONFIG_DIR = DEFAULT_CONFIG_VALUES["generated_config_dir"] DEFAULT_CONFIG_VALUES["is_jstestfuzz"] = False TEST_SUITE_DIR = DEFAULT_CONFIG_VALUES["test_suites_dir"] -CONFIG_FILE = generate_resmoke.CONFIG_FILE +CONFIG_FILE = generate_resmoke.EVG_CONFIG_FILE CONFIG_FORMAT_FN = generate_resmoke.CONFIG_FORMAT_FN REPL_MIXED_VERSION_CONFIGS = ["new-old-new", "new-new-old", "old-new-new"] SHARDED_MIXED_VERSION_CONFIGS = ["new-old-old-new"] @@ -73,7 +71,7 @@ def enable_logging(): def is_suite_sharded(suite_dir: str, suite_name: str) -> bool: """Return true if a suite uses ShardedClusterFixture.""" - source_config = generate_resmoke.read_yaml(suite_dir, suite_name + ".yml") + source_config = read_yaml_file(os.path.join(suite_dir, suite_name + ".yml")) return source_config["executor"]["fixture"]["class"] == "ShardedClusterFixture" @@ -125,7 +123,7 @@ def get_last_lts_yaml(last_lts_commit_hash): with open(os.path.join(temp_dir, last_lts_file), "w") as fileh: fileh.write(response.text) - backports_required_last_lts = generate_resmoke.read_yaml(temp_dir, last_lts_file) + backports_required_last_lts = read_yaml_file(os.path.join(temp_dir, last_lts_file)) return backports_required_last_lts @@ -397,7 +395,7 @@ def generate_exclude_yaml(task_path_suffix: str, output: str) -> None: LOGGER.info(f"Cannot write to {output}. Not generating tag file.") return - backports_required_latest = generate_resmoke.read_yaml(ETC_DIR, BACKPORTS_REQUIRED_FILE) + backports_required_latest = read_yaml_file(os.path.join(ETC_DIR, BACKPORTS_REQUIRED_FILE)) # Get the state of the backports_required_for_multiversion_tests.yml file for the last-lts # binary we are running tests against. We do this by using the commit hash from the last-lts |