diff options
author | David Bradford <david.bradford@mongodb.com> | 2019-05-06 14:18:47 -0400 |
---|---|---|
committer | David Bradford <david.bradford@mongodb.com> | 2019-05-06 14:18:47 -0400 |
commit | 47f195da01736bac7de695041e026dec8b6a77a6 (patch) | |
tree | ad02736fc95b149d95cf8003f44b5b9e25b2802f /buildscripts/burn_in_tests.py | |
parent | 74fbaeaa74a1e60f0a0e69c57f2ca2f3f96474da (diff) | |
download | mongo-47f195da01736bac7de695041e026dec8b6a77a6.tar.gz |
SERVER-41019: Use proper variant for burn_in generated tasks
Diffstat (limited to 'buildscripts/burn_in_tests.py')
-rw-r--r-- | buildscripts/burn_in_tests.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py index 221769ce993..c0f36e66dd7 100644 --- a/buildscripts/burn_in_tests.py +++ b/buildscripts/burn_in_tests.py @@ -73,8 +73,8 @@ def parse_command_line(): parser.add_option( "--runBuildVariant", dest="run_buildvariant", default=None, - help=("The buildvariant the tasks will execute on. If not specied then tasks" - " will execute on the the buildvariant specied in --buildVariant.")) + help=("The buildvariant the tasks will execute on. If not specified then tasks" + " will execute on the the buildvariant specified in --buildVariant.")) parser.add_option( "--distro", dest="distro", default=None, @@ -446,9 +446,12 @@ def _set_resmoke_cmd(options, args): return new_args -def _sub_task_name(variant, task, task_num): +def _sub_task_name(options, task, task_num): """Return the generated sub-task name.""" - return "burn_in:{}_{}_{}".format(variant, task, task_num) + task_name_prefix = options.buildvariant + if options.run_buildvariant: + task_name_prefix = options.run_buildvariant + return "burn_in:{}_{}_{}".format(task_name_prefix, task, task_num) def _get_run_buildvariant(options): @@ -467,7 +470,7 @@ def create_generate_tasks_file(options, tests_by_task): for task in sorted(tests_by_task): multiversion_path = tests_by_task[task].get("use_multiversion") for test_num, test in enumerate(tests_by_task[task]["tests"]): - sub_task_name = _sub_task_name(options.buildvariant, task, test_num) + sub_task_name = _sub_task_name(options, task, test_num) task_names.append(sub_task_name) evg_sub_task = evg_config.task(sub_task_name) evg_sub_task.dependency(TaskDependency("compile")) |