SERVER-84747 Update test configuration to reflect enterprise module changes

GitOrigin-RevId: 644f527db18d2af0f2bb1d70d939f21931f0237c
This commit is contained in:
Steve Gross 2023-12-26 17:33:34 +00:00 committed by MongoDB Bot
parent ae260a5ce7
commit d67e414c8d
18 changed files with 115 additions and 276 deletions

2
.gitignore vendored
View File

@ -1,4 +1,6 @@
/build
/src/mongo/db/modules/*
!/src/mongo/db/modules/enterprise/
/src/mongo/db/modules
/.jsdbshell
/.cache

View File

@ -42,7 +42,7 @@ EXTERNAL_LOGGERS = {
DEFAULT_VARIANT = "enterprise-rhel-80-64-bit-dynamic-required"
ENTERPRISE_MODULE_PATH = "src/mongo/db/modules/enterprise"
DEFAULT_REPO_LOCATIONS = [".", f"./{ENTERPRISE_MODULE_PATH}"]
DEFAULT_REPO_LOCATIONS = ["."]
REPEAT_SUITES = 2
DEFAULT_EVG_PROJECT_FILE = "etc/evergreen.yml"
# The executor_file and suite_files defaults are required to make the suite resolver work

View File

@ -19,18 +19,15 @@ from buildscripts.patch_builds.change_data import generate_revision_map, \
LOGGER = structlog.get_logger(__name__)
MONGO_REVISION_ENV_VAR = "REVISION"
ENTERPRISE_REVISION_ENV_VAR = "ENTERPRISE_REV"
def _get_repos_and_revisions() -> Tuple[List[Repo], RevisionMap]:
"""Get the repo object and a map of revisions to compare against."""
modules = git.get_module_paths()
repos = [Repo(path) for path in modules]
revision_map = generate_revision_map(
repos, {
"mongo": os.environ.get(MONGO_REVISION_ENV_VAR),
"enterprise": os.environ.get(ENTERPRISE_REVISION_ENV_VAR)
})
revision_map = generate_revision_map(repos, {
"mongo": os.environ.get(MONGO_REVISION_ENV_VAR),
})
return repos, revision_map

View File

@ -2,6 +2,9 @@
from typing import List
from git import Repo
from requests import HTTPError
import yaml
from evergreen import EvergreenApi
from buildscripts.patch_builds.change_data import RevisionMap, generate_revision_map
@ -17,11 +20,20 @@ def generate_revision_map_from_manifest(repos: List[Repo], task_id: str,
:param evg_api: Evergreen API object.
:return: Map of repositories to revisions
"""
manifest = evg_api.manifest_for_task(task_id)
revisions_data = {
module_name: module.revision
for module_name, module in manifest.modules.items()
}
revisions_data["mongo"] = manifest.revision
return generate_revision_map(repos, revisions_data)
try:
manifest = evg_api.manifest_for_task(task_id)
revisions_data = {
module_name: module.revision
for module_name, module in manifest.modules.items()
}
revisions_data["mongo"] = manifest.revision
return generate_revision_map(repos, revisions_data)
except HTTPError as err:
# Manifest unavailable from Evergreen? Just make a fake one:
if err.response.status_code == 404:
with open("../expansions.yml") as file_handle:
return generate_revision_map(repos,
{"mongo": yaml.safe_load(file_handle)["revision"]})
# Some other Evergreen error? Raise it up the stack!
else:
raise err

View File

@ -79,7 +79,7 @@ class TestGenerateEvgBuildVariants(unittest.TestCase):
generated_build_variant = build_variant.as_dict()
self.assertEqual(generated_build_variant["name"], generated_variant)
self.assertEqual(generated_build_variant["modules"], variant.modules)
self.assertNotIn('modules', generated_build_variant)
generated_expansions = generated_build_variant["expansions"]
burn_in_bypass_expansion_value = generated_expansions.pop("burn_in_bypass")
self.assertEqual(burn_in_bypass_expansion_value, burn_in_tags_gen_variant)

View File

@ -82,7 +82,6 @@ buildvariants:
- name: burn_in_tags_gen
- name: enterprise-rhel-80-64-bit-majority-read-concern-off
display_name: "Enterprise RHEL 8.0 (majority read concern off)"
modules: ["enterprise"]
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-majority-read-concern-off-expansions
@ -95,7 +94,6 @@ buildvariants:
- name: aggregation
- name: enterprise-rhel-80-64-bit-inmem
display_name: Enterprise RHEL 8.0 (inMemory)
modules: ["enterprise"]
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-inmem-expansions
@ -126,8 +124,6 @@ buildvariants:
multiversion_platform: rhel80
scons_cache_scope: shared
test_flags: --storageEngine=inMemory --excludeWithAnyTags=requires_persistence,requires_journaling
modules:
- enterprise
run_on:
- rhel80-small
tasks:

View File

@ -404,13 +404,6 @@ class TestGetTaskConfigsForTaskMappings(unittest.TestCase):
class TestRemoveRepoPathPrefix(unittest.TestCase):
def test_file_is_in_enterprise_modules(self):
filepath = under_test._remove_repo_path_prefix(
"src/mongo/db/modules/enterprise/src/file1.cpp")
self.assertEqual(filepath, "src/file1.cpp")
def test_file_is_not_in_enterprise_modules(self):
filepath = under_test._remove_repo_path_prefix("other_directory/src/file1.cpp")
self.assertEqual(filepath, "other_directory/src/file1.cpp")
def test_path_handling(self):
filepath = under_test._remove_repo_path_prefix("sample_directory/src/file1.cpp")
self.assertEqual(filepath, "sample_directory/src/file1.cpp")

View File

@ -73,8 +73,6 @@ variables:
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- windows-vsCurrent-small
modules:
- enterprise
expansions: &enterprise-windows-nopush-expansions-template
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi
exe: ".exe"
@ -122,8 +120,6 @@ variables:
name: enterprise-rhel-70-64-bit
display_name: "Enterprise RHEL 7.0"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel70-small
expansions: &enterprise-rhel-70-64-bit-expansions-template
@ -218,10 +214,10 @@ buildvariants:
- rhel80-medium
expansions:
resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=on --link-model=dynamic
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=on --link-model=dynamic --modules=
scons_cache_scope: shared
scons_cache_mode: all
test_flags: --excludeWithAnyTags=requires_http_client
test_flags: --excludeWithAnyTags=requires_http_client --enableEnterpriseTests=off
target_resmoke_time: 15
max_sub_suites: 5
num_scons_link_jobs_available: 0.99
@ -282,11 +278,11 @@ buildvariants:
expansions:
use_wt_develop: true
resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=on --link-model=dynamic
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=on --link-model=dynamic --modules=
scons_cache_mode: all
scons_cache_scope: shared
num_scons_link_jobs_available: 0.99
test_flags: --excludeWithAnyTags=requires_http_client
test_flags: --excludeWithAnyTags=requires_http_client --enableEnterpriseTests=off
- name: linux-64-duroff
display_name: Linux (No Journal)
@ -294,13 +290,13 @@ buildvariants:
run_on:
- rhel80-small
expansions: &linux-64-required-duroff-expansions
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=off --link-model=dynamic
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=off --link-model=dynamic --modules=
multiversion_platform: rhel80
multiversion_edition: targeted
# Running WiredTiger with --nojournal in a replica set is no longer supported, so this variant
# does not include replica set tests. Since transactions are only supported on replica sets, we
# exclude those tests as well.
test_flags: --nojournal --excludeWithAnyTags=requires_journaling,requires_replication,requires_sharding,uses_transactions,requires_http_client
test_flags: --nojournal --excludeWithAnyTags=requires_journaling,requires_replication,requires_sharding,uses_transactions,requires_http_client --enableEnterpriseTests=off
scons_cache_mode: all
scons_cache_scope: shared
num_scons_link_jobs_available: 0.99
@ -343,8 +339,6 @@ buildvariants:
name: enterprise-rhel80-dynamic-v4gcc-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8.0 v4 Toolchain GCC DEBUG"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-small
expansions: &enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
@ -452,8 +446,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-coverage
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage"
modules:
- enterprise
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -535,8 +527,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-coverage-clang
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage (clang)"
modules:
- enterprise
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -568,8 +558,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-coverage-experimental
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage (v4)"
modules:
- enterprise
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -598,8 +586,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-coverage-clang-experimental
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage (v4 clang)"
modules:
- enterprise
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -628,8 +614,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-bson-column
display_name: "~ Shared Library Enterprise RHEL 8.0 (BSONColumn validate)"
modules:
- enterprise
run_on:
- rhel80-small
expansions:
@ -773,8 +757,6 @@ buildvariants:
compile_flags: --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_testing_clang.vars --cxx-std=20 --experimental-optimization=* --experimental-runtime-hardening=*
- name: stm-daily-cron
modules:
- enterprise
display_name: "~ STM Daily Cron"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
@ -789,8 +771,6 @@ buildvariants:
- name: powercycle_smoke_skip_compile_gen
- name: security-daily-cron
modules:
- enterprise
display_name: "~ Security Daily Cron"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
@ -811,7 +791,7 @@ buildvariants:
expansions:
exe: ".exe"
content_type: application/zip
compile_flags: --dbg=on --opt=on --win-version-min=win10 -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") MONGO_DISTMOD=windows
compile_flags: --dbg=on --opt=on --win-version-min=win10 -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") MONGO_DISTMOD=windows --modules=
num_scons_link_jobs_available: 0.25
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
@ -819,7 +799,7 @@ buildvariants:
multiversion_platform: windows
multiversion_edition: enterprise
large_distro_name: windows-vsCurrent-large
test_flags: &windows_common_test_excludes --excludeWithAnyTags=incompatible_with_windows_tls
test_flags: &windows_common_test_excludes --excludeWithAnyTags=incompatible_with_windows_tls --enableEnterpriseTests=off
tasks:
- name: compile_test_and_package_serial_TG
distros:
@ -873,8 +853,6 @@ buildvariants:
name: enterprise-windows-required
display_name: "! Enterprise Windows"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
modules:
- enterprise
run_on:
- windows-vsCurrent-small
expansions:
@ -1028,8 +1006,6 @@ buildvariants:
- name: enterprise-windows-cxx20-debug-experimental
display_name: "~ Enterprise Windows C++20 DEBUG"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- windows-vsCurrent-small
expansions:
@ -1083,8 +1059,6 @@ buildvariants:
- name: enterprise-windows-debug-unoptimized
display_name: Enterprise Windows DEBUG (Unoptimized)
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- windows-vsCurrent-small
expansions:
@ -1122,10 +1096,10 @@ buildvariants:
run_on:
- macos-1100
expansions: &macos-debug-expansions
test_flags: --excludeWithAnyTags=incompatible_with_macos
test_flags: --excludeWithAnyTags=incompatible_with_macos --enableEnterpriseTests=off
resmoke_jobs_max: 6
compile_env: DEVELOPER_DIR=/Applications/Xcode13.app
compile_flags: --ssl --dbg=on --opt=on -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx.vars
compile_flags: --ssl --dbg=on --opt=on -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx.vars --modules=
num_scons_link_jobs_available: 0.99
tasks:
- name: compile_test_and_package_serial_TG
@ -1146,8 +1120,6 @@ buildvariants:
- name: enterprise-macos-rosetta-2
display_name: "Enterprise macOS Via Rosetta 2"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- macos-1100-arm64
expansions:
@ -1174,8 +1146,6 @@ buildvariants:
- name: enterprise-macos-cxx20
display_name: "Enterprise macOS C++20 DEBUG"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- macos-1100
expansions:
@ -1200,8 +1170,6 @@ buildvariants:
- name: enterprise-macos-arm64
display_name: "~ Enterprise macOS arm64"
modules:
- enterprise
run_on:
- macos-1100-arm64
expansions:
@ -1237,10 +1205,11 @@ buildvariants:
- macos-1100
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
expansions:
test_flags: --excludeWithAnyTags=uses_transactions,incompatible_with_macos
test_flags: --excludeWithAnyTags=uses_transactions,incompatible_with_macos --enableEnterpriseTests=off
cmake_path: /Applications/cmake-3.11.0-Darwin-x86_64/CMake.app/Contents/bin/cmake
compile_env: DEVELOPER_DIR=/Applications/Xcode13.app
compile_flags: >-
--modules=
--lto
--variables-files=etc/scons/xcode_macosx.vars
-j$(sysctl -n hw.logicalcpu)
@ -1264,9 +1233,10 @@ buildvariants:
run_on:
- ubuntu1804-build
expansions:
test_flags: --excludeWithAnyTags=uses_transactions
test_flags: --excludeWithAnyTags=uses_transactions --enableEnterpriseTests=off
# We need --allocator=system here to work around SERVER-27675
compile_flags: >-
--modules=
--variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
-j$(grep -c ^processor /proc/cpuinfo)
LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib"
@ -1288,8 +1258,6 @@ buildvariants:
name: enterprise-rhel-80-64-bit-dynamic-required
display_name: "! Shared Library Enterprise RHEL 8.0"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
modules:
- enterprise
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-required-expansions
@ -1436,8 +1404,6 @@ buildvariants:
display_name: "! Shared Library Enterprise RHEL 8.0 (all feature flags)"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
stepback: false
modules:
- enterprise
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions
@ -1575,8 +1541,6 @@ buildvariants:
display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
stepback: false
modules:
- enterprise
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-classic-engine-expansions
@ -1694,8 +1658,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-large-txns-format
display_name: "Enterprise RHEL 8.0 (large transactions format)"
modules:
- enterprise
run_on:
- rhel80-small
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -1778,8 +1740,6 @@ buildvariants:
name: enterprise-rhel-80-64-bit-multiversion
display_name: "Enterprise RHEL 8.0 (implicit multiversion)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-multiversion-expansions-template
@ -1841,8 +1801,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-future-git-tag-multiversion
display_name: "Enterprise RHEL 8.0 (future git tag multiversion)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-small
expansions:
@ -1916,8 +1874,6 @@ buildvariants:
name: enterprise-rhel-80-64-bit-suggested
display_name: "* Enterprise RHEL 8.0"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
modules:
- enterprise
run_on:
- rhel80-build
expansions:
@ -2064,11 +2020,12 @@ buildvariants:
expansions:
resmoke_jobs_factor: 1
disable_shared_scons_cache: true
compile_flags: MONGO_DISTMOD=ubuntu1804 --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: MONGO_DISTMOD=ubuntu1804 --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
tooltags: ""
build_mongoreplay: true
test_flags: >-
--excludeWithAnyTags=requires_os_access
--enableEnterpriseTests=off
tasks:
- name: compile_and_archive_dist_test_then_package_TG
distros:
@ -2079,8 +2036,6 @@ buildvariants:
- name: enterprise-rhel-72-s390x-compile
display_name: Enterprise RHEL 7.2 s390x Compile
modules:
- enterprise
run_on:
- rhel72-zseries-test
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -2114,8 +2069,6 @@ buildvariants:
- name: enterprise-rhel80-dynamic-clang-tidy-required
display_name: "! Enterprise Clang Tidy"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
modules:
- enterprise
run_on:
- rhel80-xlarge
expansions:
@ -2141,11 +2094,13 @@ buildvariants:
- rhel80-small
expansions:
resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --modules=
scons_cache_scope: shared
scons_cache_mode: all
num_scons_link_jobs_available: 0.99
large_distro_name: rhel80-large
test_flags: >-
--excludeWithAnyTags=incompatible_with_s390x
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2177,8 +2132,6 @@ buildvariants:
- name: enterprise-rhel-80-benchmarks
display_name: Enterprise RHEL 8.0 (Benchmarks)
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-medium
expansions:
@ -2202,7 +2155,8 @@ buildvariants:
--storageEngine=ephemeralForTest
--excludeWithAnyTags=requires_persistence,requires_fsync,requires_journaling,requires_wiredtiger,uses_transactions,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams,requires_sharding,incompatible_with_eft
--mongodSetParameters="{oplogApplicationEnforcesSteadyStateConstraints: false}"
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --dbg=off --opt=on --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic
--enableEnterpriseTests=off
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --dbg=off --opt=on --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --modules=
multiversion_platform: rhel80
multiversion_edition: targeted
scons_cache_mode: all
@ -2247,8 +2201,6 @@ buildvariants:
- name: rhel80-debug-asan-all-feature-flags
display_name: "~ Shared Library ASAN Enterprise RHEL 8.0 DEBUG (all feature flags)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-build
stepback: false
@ -2258,7 +2210,7 @@ buildvariants:
# If you add anything to san_options, make sure the appropriate changes are
# also made to SConstruct.
san_options: LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo)
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --modules=
multiversion_platform: rhel80
multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under ASAN build.
@ -2271,6 +2223,7 @@ buildvariants:
test_flags: >-
--additionalFeatureFlagsFile all_feature_flags.txt
--excludeWithAnyTags=incompatible_with_shard_merge
--enableEnterpriseTests=off
separate_debug: off
tasks:
- name: cqf
@ -2322,8 +2275,6 @@ buildvariants:
- name: rhel80-debug-asan-classic-engine
display_name: ~ ASAN Enterprise RHEL 8.0 DEBUG (Classic Engine)
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-build
stepback: false
@ -2333,10 +2284,11 @@ buildvariants:
# If you add anything to san_options, make sure the appropriate changes are
# also made to SConstruct.
san_options: LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo)
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --modules=
test_flags: >-
--mongodSetParameters="{internalQueryForceClassicEngine: true}"
--excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling
--enableEnterpriseTests=off
multiversion_platform: rhel80
multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under ASAN build.
@ -2394,8 +2346,6 @@ buildvariants:
- name: rhel80-debug-ubsan-all-feature-flags
display_name: "~ Shared Library UBSAN Enterprise RHEL 8.0 DEBUG (all feature flags)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-build
stepback: false
@ -2405,13 +2355,14 @@ buildvariants:
# If you add anything to san_options, make sure the appropriate changes are
# also made to SConstruct.
san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --sanitize=undefined --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo)
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --sanitize=undefined --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --modules=
# To force disable feature flags even on the all feature flags variant, please use this file:
# buildscripts/resmokeconfig/fully_disabled_feature_flags.yml
test_flags: >-
--excludeWithAnyTags=requires_ocsp_stapling
--excludeWithAnyTags=incompatible_with_shard_merge
--additionalFeatureFlagsFile all_feature_flags.txt
--enableEnterpriseTests=off
multiversion_platform: rhel80
multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build.
@ -2466,8 +2417,6 @@ buildvariants:
- name: rhel80-debug-ubsan-classic-engine
display_name: "~ UBSAN Enterprise RHEL 8.0 DEBUG (Classic Engine)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-build
stepback: false
@ -2477,10 +2426,11 @@ buildvariants:
# If you add anything to san_options, make sure the appropriate changes are
# also made to SConstruct.
san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --sanitize=undefined --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo)
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --sanitize=undefined --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --modules=
test_flags: >-
--mongodSetParameters="{internalQueryForceClassicEngine: true}"
--excludeWithAnyTags=requires_ocsp_stapling,requires_increased_memlock_limits
--enableEnterpriseTests=off
multiversion_platform: rhel80
multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build.
@ -2533,8 +2483,6 @@ buildvariants:
name: rhel80-debug-aubsan-lite-required
display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
modules:
- enterprise
run_on:
- rhel80-build
stepback: true
@ -2544,8 +2492,8 @@ buildvariants:
# If you add anything to san_options, make sure the appropriate changes are
# also made to SConstruct.
san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=undefined,address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic
test_flags: --excludeWithAnyTags=requires_ocsp_stapling
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=undefined,address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --modules=
test_flags: --excludeWithAnyTags=requires_ocsp_stapling --enableEnterpriseTests=off
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
@ -2579,13 +2527,14 @@ buildvariants:
# If you add anything to san_options, make sure the appropriate changes are
# also made to SConstruct.
san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=undefined,address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic
compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=undefined,address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --modules=
# To force disable feature flags even on the all feature flags variant, please use this file:
# buildscripts/resmokeconfig/fully_disabled_feature_flags.yml
test_flags: >-
--excludeWithAnyTags=requires_ocsp_stapling
--excludeWithAnyTags=incompatible_with_shard_merge
--additionalFeatureFlagsFile all_feature_flags.txt
--enableEnterpriseTests=off
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2605,8 +2554,6 @@ buildvariants:
- name: enterprise-rhel80-debug-tsan
display_name: ~ TSAN Enterprise RHEL 8.0 DEBUG
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-large
stepback: false
@ -2637,8 +2584,6 @@ buildvariants:
- name: enterprise-rhel80-unoptimized-64-bit
display_name: "~ Enterprise RHEL 8.0 (without Diagnostic Latches)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
expansions:
compile_flags: MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --use-diagnostic-latches=off --link-model=dynamic
scons_cache_mode: all
@ -2658,8 +2603,6 @@ buildvariants:
- name: enterprise-rhel80-no-latch-64-bit
display_name: "~ Enterprise RHEL 8.0 DEBUG (Unoptimized)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
expansions:
compile_flags: MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --dbg=on --opt=off --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --detect-odr-violations
scons_cache_mode: all
@ -2681,8 +2624,6 @@ buildvariants:
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
modules:
- enterprise
expansions:
scons_cache_scope: shared
scons_cache_mode: all
@ -2721,8 +2662,6 @@ buildvariants:
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
modules:
- enterprise
expansions:
scons_cache_scope: shared
scons_cache_mode: all
@ -2760,8 +2699,6 @@ buildvariants:
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
modules:
- enterprise
expansions:
scons_cache_scope: shared
scons_cache_mode: all
@ -2797,8 +2734,6 @@ buildvariants:
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
modules:
- enterprise
expansions:
scons_cache_scope: shared
scons_cache_mode: all
@ -2835,8 +2770,6 @@ buildvariants:
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
modules:
- enterprise
expansions:
scons_cache_scope: shared
scons_cache_mode: all
@ -2873,8 +2806,6 @@ buildvariants:
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
modules:
- enterprise
expansions:
scons_cache_scope: shared
scons_cache_mode: all
@ -2911,8 +2842,6 @@ buildvariants:
activate: false
run_on:
- rhel80-small
modules:
- enterprise
expansions:
scons_cache_scope: shared
compile_flags: MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
@ -2958,8 +2887,6 @@ buildvariants:
- name: selected-tests
display_name: "~ Selected Tests"
modules:
- enterprise
run_on:
- rhel80-small
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -2975,13 +2902,14 @@ buildvariants:
expansions:
# --link-model=dynamic is set by visiblity_test's task_compile_flags
# expansion
compile_flags: CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --win-version-min=win10
compile_flags: CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --win-version-min=win10 --modules=
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
has_packages: false
scons_cache_scope: shared
scons_cache_mode: all
num_scons_link_jobs_available: 0.99
test_flags: --enableEnterpriseTests=off
tasks:
- name: visibility_test_TG
distros:
@ -3020,8 +2948,6 @@ buildvariants:
- name: enterprise-ubuntu1804-64-libvoidstar
display_name: ~ Enterprise Ubuntu 18.04 w/ libvoidstar
cron: "0 4 * * FRI" # Every week at 0400 UTC Friday. This has to be a Friday since we run Antithesis on Fridays.
modules:
- enterprise
run_on:
- ubuntu1804-large
stepback: false
@ -3055,7 +2981,6 @@ buildvariants:
display_name: "~ Enterprise Windows WiredTiger develop"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
modules:
- enterprise
- wtdevelop
expansions:
<<: *enterprise-windows-nopush-expansions-template
@ -3074,8 +2999,6 @@ buildvariants:
- name: rhel80-debug-aubsan-lite_fuzzer
display_name: "{A,UB}SAN Enterprise RHEL 8.0 FUZZER"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-build
stepback: false
@ -3085,8 +3008,8 @@ buildvariants:
# If you add anything to san_options, make sure the appropriate changes are
# also made to SConstruct.
san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
compile_flags: LINKFLAGS=-nostdlib++ LIBS=stdc++ --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=undefined,address,fuzzer --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo)
test_flags: --excludeWithAnyTags=requires_ocsp_stapling
compile_flags: LINKFLAGS=-nostdlib++ LIBS=stdc++ --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=undefined,address,fuzzer --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --modules=
test_flags: --excludeWithAnyTags=requires_ocsp_stapling --enableEnterpriseTests=off
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

View File

@ -29,10 +29,10 @@ buildvariants:
- rhel80-medium
expansions:
resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=on --link-model=dynamic
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=on --link-model=dynamic --modules=
scons_cache_scope: shared
scons_cache_mode: all
test_flags: --excludeWithAnyTags=requires_http_client
test_flags: --excludeWithAnyTags=requires_http_client --enableEnterpriseTests=off
target_resmoke_time: 15
max_sub_suites: 5
num_scons_link_jobs_available: 0.99
@ -89,8 +89,6 @@ buildvariants:
name: enterprise-windows-required
display_name: "! Enterprise Windows"
cron: "0 */4 * * *" # Every 4 hours starting at midnight
modules:
- enterprise
run_on:
- windows-vsCurrent-small
expansions:
@ -165,8 +163,6 @@ buildvariants:
name: enterprise-rhel-80-64-bit-dynamic-required
display_name: "! Shared Library Enterprise RHEL 8.0"
cron: "0 */4 * * *" # Every 4 hours starting at midnight
modules:
- enterprise
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-required-expansions
@ -309,8 +305,6 @@ buildvariants:
- name: enterprise-ubuntu-dynamic-1804-clang-tidy-required
display_name: "! Enterprise Clang Tidy"
cron: "0 */4 * * *" # Every 4 hours starting at midnight
modules:
- enterprise
run_on:
- ubuntu1804-xlarge
expansions:
@ -332,8 +326,6 @@ buildvariants:
name: ubuntu1804-debug-aubsan-lite-required
display_name: "! Shared Library {A,UB}SAN Enterprise Ubuntu 18.04 DEBUG"
cron: "0 */4 * * *" # Every 4 hours starting at midnight
modules:
- enterprise
run_on:
- ubuntu1804-build
stepback: true
@ -412,8 +404,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-large-txns-format
display_name: "Enterprise RHEL 8.0 (large transactions format)"
modules:
- enterprise
run_on:
- rhel80-small
cron: "0 4 * * 0"
@ -489,8 +479,6 @@ buildvariants:
name: enterprise-rhel-80-64-bit-dynamic-classic-engine
display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)"
cron: "0 4 * * 0"
modules:
- enterprise
run_on:
- rhel80-small
expansions:
@ -589,8 +577,6 @@ buildvariants:
- name: vector_search_ssl
- name: security-daily-cron
modules:
- enterprise
display_name: "~ Security Daily Cron"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
@ -604,8 +590,6 @@ buildvariants:
###########################################
- name: &copybara-sync-between-repos copybara-sync-between-repos
modules:
- enterprise
display_name: "* Copybara Sync Between Repos"
activate: true
run_on:

View File

@ -4,8 +4,6 @@ buildvariants:
- name: enterprise-rhel-70-64-bit
display_name: "Enterprise RHEL 7.0"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel70-small
expansions:

View File

@ -3,8 +3,6 @@
buildvariants:
- name: enterprise-rhel-81-ppc64le
display_name: Enterprise RHEL 8.1 PPC64LE
modules:
- enterprise
run_on:
- rhel81-power8-small
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -57,8 +55,6 @@ buildvariants:
- name: enterprise-rhel-71-ppc64le
display_name: Enterprise RHEL 7.1 PPC64LE
modules:
- enterprise
run_on:
- rhel71-power8-small
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -111,8 +107,6 @@ buildvariants:
- name: enterprise-rhel-72-s390x
display_name: Enterprise RHEL 7.2 s390x
modules:
- enterprise
run_on:
- rhel72-zseries-test
cron: "0 4 * * 0"
@ -165,8 +159,6 @@ buildvariants:
- name: enterprise-rhel-83-s390x
display_name: Enterprise RHEL 8.3 s390x
modules:
- enterprise
run_on:
- rhel83-zseries-small
cron: "0 4 * * 0"

View File

@ -4,8 +4,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-inmem
display_name: Enterprise RHEL 8.0 (inMemory)
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-small
expansions:
@ -67,8 +65,6 @@ buildvariants:
- name: enterprise-windows-inmem
display_name: Enterprise Windows (inMemory)
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- windows-vsCurrent-small
expansions:

View File

@ -8,12 +8,12 @@ buildvariants:
- amazon2-test
expansions:
test_flags: >-
--excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux
--excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux --enableEnterpriseTests=off
push_path: linux
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-amazon2
compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
multiversion_platform: amazon2
multiversion_edition: targeted
has_packages: true
@ -53,8 +53,6 @@ buildvariants:
- name: enterprise-amazon2
display_name: "Enterprise Amazon Linux 2"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- amazon2-test
expansions:
@ -118,8 +116,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: aarch64-amazon2
compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux
compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux --enableEnterpriseTests=off
has_packages: true
packager_script: packager.py
packager_arch: aarch64
@ -155,8 +153,6 @@ buildvariants:
- name: enterprise-amazon2-arm64
display_name: "Enterprise Amazon Linux 2 arm64"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- amazon2-arm64-small
expansions:
@ -283,7 +279,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-debian10
compile_flags: --ssl MONGO_DISTMOD=debian10 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=debian10 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
multiversion_platform: linux_x86_64
multiversion_edition: base
multiversion_platform_42_or_later: debian10
@ -324,8 +321,6 @@ buildvariants:
- name: enterprise-debian10-64
display_name: Enterprise Debian 10
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- debian10-test
expansions:
@ -382,7 +377,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-debian11
compile_flags: --ssl MONGO_DISTMOD=debian11 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=debian11 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
multiversion_platform: linux_x86_64
multiversion_edition: base
multiversion_platform_42_or_later: debian11
@ -423,8 +419,6 @@ buildvariants:
- name: enterprise-debian11-64
display_name: Enterprise Debian 11
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- debian11-small
expansions:
@ -478,7 +472,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-rhel70
compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
multiversion_platform: rhel70
multiversion_edition: targeted
has_packages: true
@ -522,7 +517,8 @@ buildvariants:
run_on:
- rhel76-test
expansions:
compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
tasks:
- name: compile_and_archive_dist_test_then_package_TG
distros:
@ -539,11 +535,11 @@ buildvariants:
expansions:
resmoke_jobs_factor: 1
disable_shared_scons_cache: true
compile_flags: MONGO_DISTMOD=rhel80 --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: MONGO_DISTMOD=rhel80 --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
tooltags: ""
build_mongoreplay: true
test_flags: >-
--excludeWithAnyTags=requires_os_access
--excludeWithAnyTags=requires_os_access --enableEnterpriseTests=off
tasks:
- name: compile_and_archive_dist_test_then_package_TG
distros:
@ -562,7 +558,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-rhel80
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
multiversion_platform: rhel80
multiversion_edition: targeted
has_packages: true
@ -602,8 +599,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit
display_name: "Enterprise RHEL 8.0"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-expansions
@ -726,7 +721,7 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: aarch64-rhel82
compile_flags: --ssl MONGO_DISTMOD=rhel82 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=rhel82 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
has_packages: true
packager_script: packager.py
packager_arch: aarch64
@ -734,7 +729,7 @@ buildvariants:
repo_edition: org
scons_cache_scope: shared
large_distro_name: rhel82-arm64-large
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits --enableEnterpriseTests=off
tasks:
- name: compile_test_and_package_serial_TG
distros:
@ -763,8 +758,6 @@ buildvariants:
- name: enterprise-rhel-82-arm64
display_name: "Enterprise RHEL 8.2 arm64"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel82-arm64-small
expansions:
@ -829,7 +822,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-rhel90
compile_flags: --ssl MONGO_DISTMOD=rhel90 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=rhel90 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
multiversion_platform: rhel90
multiversion_edition: targeted
has_packages: true
@ -869,8 +863,6 @@ buildvariants:
- name: enterprise-rhel-90-64-bit
display_name: "Enterprise RHEL 9.0"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel90-small
expansions: &enterprise-rhel-90-64-bit-expansions
@ -953,7 +945,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: aarch64-rhel90
compile_flags: --ssl MONGO_DISTMOD=rhel90 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=rhel90 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
has_packages: true
packager_script: packager.py
packager_arch: aarch64
@ -989,8 +982,6 @@ buildvariants:
- name: enterprise-rhel-90-arm64
display_name: "Enterprise RHEL 9.0 arm64"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel90-arm64-small
expansions:
@ -1055,7 +1046,7 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-suse12
compile_flags: --ssl MONGO_DISTMOD=suse12 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=suse12 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
multiversion_platform: suse12
multiversion_edition: targeted
has_packages: true
@ -1064,7 +1055,7 @@ buildvariants:
packager_distro: suse12
repo_edition: org
scons_cache_scope: shared
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits --enableEnterpriseTests=off
large_distro_name: suse12-sp5-large
tasks:
- name: compile_test_and_package_serial_TG
@ -1097,8 +1088,6 @@ buildvariants:
- name: enterprise-suse12-64
display_name: Enterprise SLES 12
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- suse12-sp5-small
expansions:
@ -1144,8 +1133,6 @@ buildvariants:
- name: enterprise-suse15-64
display_name: Enterprise SLES 15
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- suse15-test
expansions:
@ -1194,7 +1181,7 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-suse15
compile_flags: --ssl MONGO_DISTMOD=suse15 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=suse15 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
multiversion_platform: linux_x86_64
multiversion_edition: base
multiversion_platform_42_or_later: suse15
@ -1205,7 +1192,7 @@ buildvariants:
packager_distro: suse15
repo_edition: org
scons_cache_scope: shared
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits --enableEnterpriseTests=off
large_distro_name: suse15-build
tasks:
- name: compile_test_and_package_serial_TG
@ -1243,10 +1230,10 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-ubuntu1804
compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
multiversion_platform: ubuntu1804
multiversion_edition: targeted
test_flags: --excludeWithAnyTags=requires_ocsp_stapling
test_flags: --excludeWithAnyTags=requires_ocsp_stapling --enableEnterpriseTests=off
has_packages: true
packager_script: packager.py
packager_arch: x86_64
@ -1288,8 +1275,6 @@ buildvariants:
- name: enterprise-ubuntu1804-64
display_name: Enterprise Ubuntu 18.04
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- ubuntu1804-test
stepback: false
@ -1353,8 +1338,6 @@ buildvariants:
- name: enterprise-ubuntu1804-arm64
display_name: Enterprise Ubuntu 18.04 arm64
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- ubuntu1804-arm64-build
expansions:
@ -1412,8 +1395,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: aarch64-ubuntu1804
compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
test_flags: --excludeWithAnyTags=requires_ocsp_stapling
compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --excludeWithAnyTags=requires_ocsp_stapling --enableEnterpriseTests=off
resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers
has_packages: true
packager_script: packager.py
@ -1443,7 +1426,7 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-ubuntu2204
compile_flags: --ssl MONGO_DISTMOD=ubuntu2204 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=ubuntu2204 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
multiversion_platform: ubuntu2204
multiversion_edition: targeted
has_packages: true
@ -1453,7 +1436,7 @@ buildvariants:
repo_edition: org
scons_cache_scope: shared
large_distro_name: ubuntu2204-large
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits
test_flags: --excludeWithAnyTags=requires_increased_memlock_limits --enableEnterpriseTests=off
tasks:
- name: compile_test_and_package_serial_TG
distros:
@ -1491,7 +1474,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-ubuntu2004
compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
multiversion_platform: ubuntu2004
multiversion_edition: targeted
has_packages: true
@ -1530,8 +1514,6 @@ buildvariants:
- name: enterprise-ubuntu2004-64
display_name: Enterprise Ubuntu 20.04
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- ubuntu2004-small
stepback: false
@ -1581,8 +1563,6 @@ buildvariants:
- name: enterprise-ubuntu2204-64
display_name: Enterprise Ubuntu 22.04
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- ubuntu2204-small
stepback: false
@ -1632,8 +1612,6 @@ buildvariants:
- name: enterprise-ubuntu2004-arm64
display_name: Enterprise Ubuntu 20.04 arm64
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- ubuntu2004-arm64-large
expansions:
@ -1690,7 +1668,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: aarch64-ubuntu2004
compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers
has_packages: true
packager_script: packager.py
@ -1713,8 +1692,6 @@ buildvariants:
- name: enterprise-ubuntu2204-arm64
display_name: Enterprise Ubuntu 22.04 arm64
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- ubuntu2204-arm64-large
expansions:
@ -1771,7 +1748,8 @@ buildvariants:
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: aarch64-ubuntu2204
compile_flags: --ssl MONGO_DISTMOD=ubuntu2204 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
compile_flags: --ssl MONGO_DISTMOD=ubuntu2204 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules=
test_flags: --enableEnterpriseTests=off
resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers
has_packages: true
packager_script: packager.py
@ -1807,13 +1785,13 @@ buildvariants:
multiversion_platform_44_or_later: windows
multiversion_edition: base
content_type: application/zip
compile_flags: --ssl MONGO_DISTMOD=windows -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
compile_flags: --ssl MONGO_DISTMOD=windows -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10 --modules=
num_scons_link_jobs_available: 0.25
python: '/cygdrive/c/python/python37/python.exe'
ext: zip
scons_cache_scope: shared
large_distro_name: windows-vsCurrent-large
test_flags: &windows_common_test_excludes --excludeWithAnyTags=incompatible_with_windows_tls
test_flags: &windows_common_test_excludes --excludeWithAnyTags=incompatible_with_windows_tls --enableEnterpriseTests=off
tasks:
- name: compile_test_and_package_serial_TG
distros:
@ -1850,8 +1828,6 @@ buildvariants:
- name: enterprise-windows
display_name: "Enterprise Windows"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- windows-vsCurrent-small
expansions:
@ -1922,13 +1898,13 @@ buildvariants:
run_on:
- macos-1100
expansions:
test_flags: --excludeWithAnyTags=incompatible_with_macos
test_flags: --excludeWithAnyTags=incompatible_with_macos --enableEnterpriseTests=off
push_path: osx
push_bucket: downloads.mongodb.org
push_name: macos
push_arch: x86_64
compile_env: DEVELOPER_DIR=/Applications/Xcode13.app
compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx.vars
compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx.vars --modules=
resmoke_jobs_max: 6
tasks:
- name: compile_test_and_package_serial_TG
@ -1969,13 +1945,13 @@ buildvariants:
run_on:
- macos-1100-arm64
expansions:
test_flags: --excludeWithAnyTags=incompatible_with_macos
test_flags: --excludeWithAnyTags=incompatible_with_macos --enableEnterpriseTests=off
push_path: osx
push_bucket: downloads.mongodb.org
push_name: macos
push_arch: arm64
compile_env: DEVELOPER_DIR=/Applications/Xcode13.app
compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx_arm.vars
compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx_arm.vars --modules=
resmoke_jobs_max: 6
tasks:
- name: compile_test_and_package_serial_TG
@ -2013,8 +1989,6 @@ buildvariants:
- name: enterprise-macos
display_name: Enterprise macOS
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- macos-1100
expansions:
@ -2048,8 +2022,6 @@ buildvariants:
- name: enterprise-macos-arm64
display_name: Enterprise macOS arm64
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- macos-1100-arm64
expansions:

View File

@ -3,8 +3,6 @@ buildvariants:
- name: enterprise-windows-ninja
display_name: "Ninja Build: Enterprise Windows"
cron: "0 4 * * 0" # Run once a week to ensure no failures introduced to ninja builds
modules:
- enterprise
expansions:
compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
tasks:
@ -18,8 +16,6 @@ buildvariants:
- name: macos-enterprise-ninja
display_name: "Ninja Build: macOS Enterprise"
cron: "0 4 * * 0" # Run once a week to ensure no failures introduced to ninja builds
modules:
- enterprise
run_on:
- macos-1100
expansions:
@ -32,13 +28,12 @@ buildvariants:
- name: ubuntu1804-ninja-build-profiles
display_name: "Ninja Build Profiles: Ubuntu 18.04"
cron: "0 4 * * 0" # # Run once a week to ensure no failures introduced to build profiles
modules:
- enterprise
run_on:
- ubuntu1804-small
stepback: false
expansions:
compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo)
compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --modules=
test_flags: --enableEnterpriseTests=off
repo_edition: enterprise
has_packages: false
tasks:
@ -58,8 +53,6 @@ buildvariants:
- name: enterprise-rhel-80-64-bit-dynamic-required-ninja
display_name: "Ninja Build: Enterprise RHEL 8.0"
cron: "0 4 * * 0" # Run once a week to ensure no failures introduced to ninja builds
modules:
- enterprise
run_on:
- rhel80-small
expansions:
@ -76,8 +69,6 @@ buildvariants:
- name: enterprise-rhel80-ninja
display_name: "Ninja Build: RHEL 8.0"
cron: "0 4 * * 0" # Run once a week to ensure no failures introduced to ninja builds
modules:
- enterprise
run_on:
- rhel80-small
stepback: false

View File

@ -28,8 +28,6 @@ buildvariants:
- name: rhel80-debug-asan
display_name: ~ ASAN Enterprise RHEL 8.0 DEBUG
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-build
stepback: false
@ -102,8 +100,6 @@ buildvariants:
- name: rhel80-debug-ubsan
display_name: ~ UBSAN Enterprise RHEL 8.0 DEBUG
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- rhel80-build
stepback: false

View File

@ -3,8 +3,6 @@
buildvariants:
- name: generate-tasks-for-version
display_name: "Generate tasks for evergreen version"
modules:
- enterprise
run_on:
- rhel80-medium
tasks:

View File

@ -55,7 +55,6 @@ variables:
_src_dir: &src_dir src/mongo
_modules: &modules
- enterprise
- mongo-tools
# - mongo
- dsi
@ -122,10 +121,6 @@ modules:
# prefix: ${workdir}/src
# branch: master
###
- name: enterprise
repo: git@github.com:10gen/mongo-enterprise-modules.git
prefix: src/mongo/db/modules
branch: v6.0
- name: mongo-tools
repo: git@github.com:mongodb/mongo-tools.git
prefix: mongo-tools/src/github.com/mongodb
@ -554,7 +549,6 @@ tasks:
params:
directory: src
revisions:
enterprise: ${enterprise_rev}
mongo-tools: ${mongo-tools_rev}
- func: "compile mongodb"

View File

@ -7,8 +7,3 @@ set -o verbose
set -o errexit
git diff --name-only origin/${branch_name}... --line-prefix="${workdir}/src/" --diff-filter=d >> modified_and_created_patch_files.txt
if [ -d src/mongo/db/modules/enterprise ]; then
pushd src/mongo/db/modules/enterprise
git diff HEAD --name-only --line-prefix="${workdir}/src/src/mongo/db/modules/enterprise/" --diff-filter=d >> ~1/modified_and_created_patch_files.txt
popd
fi