diff options
| author | Mikhail Shchatko <mikhail.shchatko@mongodb.com> | 2021-10-29 13:25:11 +0300 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-01 08:55:11 +0000 |
| commit | 02751b472c71026b601c1c7a5aeceacc135f0667 (patch) | |
| tree | 11a008241d4b87f892b12a01923acd35416acb64 | |
| parent | 7a2e23cfea4801e45e01ddfa2ca9fd905b4b8a73 (diff) | |
| download | mongo-02751b472c71026b601c1c7a5aeceacc135f0667.tar.gz | |
SERVER-61077 Pass mixed_bin_versions from suite definition to TestData object
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/_builder.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/_builder.py b/buildscripts/resmokelib/testing/fixtures/_builder.py index 8215a1406da..19bc0c103c0 100644 --- a/buildscripts/resmokelib/testing/fixtures/_builder.py +++ b/buildscripts/resmokelib/testing/fixtures/_builder.py @@ -74,6 +74,8 @@ class ReplSetBuilder(FixtureBuilder): # 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("-") + 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) # We also hijack the num_nodes because we need it here. @@ -282,6 +284,8 @@ class ShardedClusterBuilder(FixtureBuilder): # 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("-") + 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) is_multiversion = mixed_bin_versions is not None |