diff options
Diffstat (limited to 'buildscripts/resmokelib/testing/fixtures/_builder.py')
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/_builder.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/_builder.py b/buildscripts/resmokelib/testing/fixtures/_builder.py index 19bc0c103c0..fc4215b807e 100644 --- a/buildscripts/resmokelib/testing/fixtures/_builder.py +++ b/buildscripts/resmokelib/testing/fixtures/_builder.py @@ -73,10 +73,13 @@ class ReplSetBuilder(FixtureBuilder): # We have the same code in configure_resmoke.py to split config.MIXED_BIN_VERSIONS, # but here it is for the case, when it comes from resmoke suite definition if isinstance(mixed_bin_versions, str): - mixed_bin_versions = mixed_bin_versions.split("-") + mixed_bin_versions = mixed_bin_versions.split("_") if config.MIXED_BIN_VERSIONS is None: config.MIXED_BIN_VERSIONS = mixed_bin_versions + old_bin_version = kwargs.pop("old_bin_version", config.MULTIVERSION_BIN_VERSION) + if config.MULTIVERSION_BIN_VERSION is None: + config.MULTIVERSION_BIN_VERSION = old_bin_version # We also hijack the num_nodes because we need it here. num_nodes = kwargs.pop("num_nodes", 2) @@ -283,10 +286,14 @@ class ShardedClusterBuilder(FixtureBuilder): # We have the same code in configure_resmoke.py to split config.MIXED_BIN_VERSIONS, # but here it is for the case, when it comes from resmoke suite definition if isinstance(mixed_bin_versions, str): - mixed_bin_versions = mixed_bin_versions.split("-") + mixed_bin_versions = mixed_bin_versions.split("_") if config.MIXED_BIN_VERSIONS is None: config.MIXED_BIN_VERSIONS = mixed_bin_versions + old_bin_version = kwargs.pop("old_bin_version", config.MULTIVERSION_BIN_VERSION) + if config.MULTIVERSION_BIN_VERSION is None: + config.MULTIVERSION_BIN_VERSION = old_bin_version + is_multiversion = mixed_bin_versions is not None num_shards = kwargs.pop("num_shards", 1) |