diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/evergreen.yml | 2 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 2 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/variants/misc_release.yml | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 4148aff4fbd..c105f5d83d9 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -954,6 +954,8 @@ buildvariants: python: '/cygdrive/c/python/python37/python.exe' ext: zip scons_cache_scope: shared + multiversion_platform: windows + multiversion_edition: enterprise jstestfuzz_num_generated_files: 35 target_resmoke_time: 20 max_sub_suites: 3 diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index fe3d94e9ff9..540c2eccdf3 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -895,6 +895,7 @@ functions: "do multiversion setup": - *f_expansions_write + - *set_up_venv - *do_multiversion_setup # Used by generator @@ -6387,7 +6388,6 @@ tasks: - func: "set up remote credentials" - *f_expansions_write - func: "configure evergreen api credentials" - - func: "do multiversion setup" - func: "run tests" vars: resmoke_jobs_max: 1 diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml index 229112855cb..d98219fb014 100644 --- a/etc/evergreen_yml_components/variants/misc_release.yml +++ b/etc/evergreen_yml_components/variants/misc_release.yml @@ -290,8 +290,13 @@ buildvariants: compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" # TODO BUILD-13887 should fix uses_pykmip incompatibility. - test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip + test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip,requires_v4_0 has_packages: true + multiversion_platform: amazon2 + multiversion_edition: enterprise + multiversion_architecture: arm64 + multiversion_architecture_42_or_later: aarch64 + multiversion_skip_install_for_40: "true" packager_script: packager_enterprise.py packager_arch: aarch64 packager_distro: amazon2 |