diff options
| author | David Bradford <david.bradford@mongodb.com> | 2020-08-13 13:32:18 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-13 20:17:14 +0000 |
| commit | 7ef0e225846a25821325bd24fc66d29f4c503385 (patch) | |
| tree | 76705666019bc1845405a0bacd21a17af0024674 | |
| parent | df5b9daec28555e5fb091e32a821b53d2d92bafe (diff) | |
| download | mongo-7ef0e225846a25821325bd24fc66d29f4c503385.tar.gz | |
SERVER-50290: Cap number of subtasks generated
(cherry picked from commit 53b690294d160a6e1cd0f4a004cb55c4835a48b8)
| -rwxr-xr-x | buildscripts/evergreen_generate_resmoke_tasks.py | 2 | ||||
| -rw-r--r-- | buildscripts/tests/test_evergreen_generate_resmoke_tasks.py | 2 | ||||
| -rw-r--r-- | etc/evergreen.yml | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/buildscripts/evergreen_generate_resmoke_tasks.py b/buildscripts/evergreen_generate_resmoke_tasks.py index e734e3eb49c..a5fc8011f48 100755 --- a/buildscripts/evergreen_generate_resmoke_tasks.py +++ b/buildscripts/evergreen_generate_resmoke_tasks.py @@ -67,7 +67,7 @@ REQUIRED_CONFIG_KEYS = { DEFAULT_CONFIG_VALUES = { "generated_config_dir": "generated_resmoke_config", "max_tests_per_suite": 100, - "max_sub_suites": 10, + "max_sub_suites": 3, "resmoke_args": "", "resmoke_repeat_suites": 1, "run_multiple_jobs": "true", diff --git a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py index 4f65fe4b32c..f93c2e7c3b2 100644 --- a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py +++ b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py @@ -212,7 +212,7 @@ class TestAcceptance(unittest.TestCase): # the evergreen json config. generated_files = os.listdir(target_directory) # The expected suite count is the number of tests + the _misc suite. - expected_suite_count = n_tests + 1 + expected_suite_count = 3 + 1 # We expect files for all the suites + the evergreen json config. self.assertEqual(expected_suite_count + 1, len(generated_files)) diff --git a/etc/evergreen.yml b/etc/evergreen.yml index a7a21d11d5b..83f825bde9f 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -8645,7 +8645,7 @@ buildvariants: scons_cache_scope: shared test_flags: --excludeWithAnyTags=requires_http_client target_resmoke_time: 15 - max_sub_suites: 100 + max_sub_suites: 3 tasks: - name: compile_all_run_unittests_TG - name: .aggregation !.encrypt @@ -9614,7 +9614,7 @@ buildvariants: multiversion_edition: enterprise jstestfuzz_num_generated_files: 35 target_resmoke_time: 20 - max_sub_suites: 100 + max_sub_suites: 3 large_distro_name: windows-64-vs2019-large push_path: windows push_bucket: downloads.10gen.com @@ -9655,7 +9655,7 @@ buildvariants: multiversion_edition: enterprise jstestfuzz_num_generated_files: 35 target_resmoke_time: 20 - max_sub_suites: 100 + max_sub_suites: 3 large_distro_name: windows-64-vs2019-large push_path: windows push_bucket: downloads.10gen.com @@ -10034,7 +10034,7 @@ buildvariants: jstestfuzz_num_generated_files: 40 jstestfuzz_concurrent_num_files: 10 target_resmoke_time: 10 - max_sub_suites: 100 + max_sub_suites: 3 large_distro_name: rhel62-large burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-inmem linux-64-duroff enterprise-rhel-62-64-bit-multiversion tasks: @@ -12138,7 +12138,7 @@ buildvariants: resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under {A,UB}SAN build. hang_analyzer_dump_core: false scons_cache_scope: shared - max_sub_suites: 100 + max_sub_suites: 3 tasks: - name: compile_all_run_unittests_TG - name: server_discovery_and_monitoring_json_test_TG |