diff --git a/.gitignore b/.gitignore index 6470c8add6a..63f29af343a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /build -/src/mongo/db/modules +/src/mongo/db/modules/* +!/src/mongo/db/modules/enterprise/ /.jsdbshell /.cache /.dbshell diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py index 5310d40bc78..4de859e43b5 100755 --- a/buildscripts/burn_in_tests.py +++ b/buildscripts/burn_in_tests.py @@ -42,7 +42,7 @@ EXTERNAL_LOGGERS = { DEFAULT_VARIANT = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-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 diff --git a/buildscripts/clang_format.py b/buildscripts/clang_format.py index 974bb3fc4e2..dc2d4db132f 100755 --- a/buildscripts/clang_format.py +++ b/buildscripts/clang_format.py @@ -265,6 +265,7 @@ def is_interesting_file(file_name): return (file_name.startswith("jstests") or file_name.startswith("src") and not file_name.startswith("src/third_party/") and not file_name.startswith("src/mongo/gotools/") + and not file_name.startswith("src/mongo/db/modules/enterprise/src/streams/third_party") and not file_name.startswith("src/streams/third_party")) and FILES_RE.search(file_name) diff --git a/buildscripts/large_file_check.py b/buildscripts/large_file_check.py index 7c5388f1f34..0219e89f7f2 100755 --- a/buildscripts/large_file_check.py +++ b/buildscripts/large_file_check.py @@ -53,18 +53,19 @@ structlog.configure( 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) - }) + + repos = [ + Repo(path) for path in modules + # Exclude enterprise module; it's in the "modules" folder but does not correspond to a repo + if "src/mongo/db/modules/enterprise" not in path + ] + + revision_map = generate_revision_map(repos, {"mongo": os.environ.get(MONGO_REVISION_ENV_VAR)}) return repos, revision_map diff --git a/buildscripts/linter/filediff.py b/buildscripts/linter/filediff.py index 23d4a988b23..61d16db88a5 100644 --- a/buildscripts/linter/filediff.py +++ b/buildscripts/linter/filediff.py @@ -19,18 +19,17 @@ 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() + modules = [ + path for path in git.get_module_paths() + # Exclude enterprise module; it's in the "modules" folder but does not correspond to a repo + if "src/mongo/db/modules/enterprise" not in path + ] 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 diff --git a/etc/evergreen_yml_components/configuration.yml b/etc/evergreen_yml_components/configuration.yml index ea886b44102..5f0c03052b2 100644 --- a/etc/evergreen_yml_components/configuration.yml +++ b/etc/evergreen_yml_components/configuration.yml @@ -67,11 +67,6 @@ patch_aliases: # if a module is added and to be added to the manifest # be sure to add the module to git.get_project revisions parameter modules: -- name: enterprise - repo: git@github.com:10gen/mongo-enterprise-modules.git - prefix: src/mongo/db/modules - branch: master - - name: wtdevelop repo: git@github.com:wiredtiger/wiredtiger.git prefix: src/third_party diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev.yml b/etc/evergreen_yml_components/variants/amazon/test_dev.yml index 6f7376274d7..94e128af6f6 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev.yml @@ -10,15 +10,13 @@ variables: run_on: - amazon2-arm64-large activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. - modules: - - enterprise stepback: false # THIS HAS COPIES IN: # - etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml # - etc/evergreen_yml_components/variants/amazon/test_dev.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES -- &linux-arm64-dynamic-compile-expansions +- &linux-arm64-dynamic-enterprise-compile-expansions scons_cache_scope: shared scons_cache_mode: all has_packages: false @@ -53,7 +51,7 @@ buildvariants: name: &amazon-linux2-arm64-crypt-compile amazon-linux2-arm64-crypt-compile display_name: "! Amazon Linux 2 arm64 Crypt Compile" expansions: - <<: *linux-arm64-dynamic-compile-expansions + <<: *linux-arm64-dynamic-enterprise-compile-expansions compile_variant: *amazon-linux2-arm64-crypt-compile tasks: - name: .crypt @@ -63,7 +61,7 @@ buildvariants: name: &amazon-linux2-arm64-dynamic-compile amazon-linux2-arm64-dynamic-compile display_name: "! Amazon Linux 2 arm64 Enterprise Shared Library Compile & Static Analysis" expansions: - <<: *linux-arm64-dynamic-compile-expansions + <<: *linux-arm64-dynamic-enterprise-compile-expansions clang_tidy_toolchain: v4 compile_variant: *amazon-linux2-arm64-dynamic-compile tasks: @@ -86,8 +84,6 @@ buildvariants: - name: &commit-queue commit-queue display_name: "~ Commit Queue" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter - modules: - - enterprise run_on: - amazon2-arm64-small stepback: false diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml index b8d52f83a98..049c0eb16c7 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml @@ -10,15 +10,13 @@ variables: run_on: - amazon2-arm64-large activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. - modules: - - enterprise stepback: false # THIS HAS COPIES IN: # - etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml # - etc/evergreen_yml_components/variants/amazon/test_dev.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES -- &linux-arm64-dynamic-compile-expansions +- &linux-arm64-dynamic-enterprise-compile-expansions scons_cache_scope: shared scons_cache_mode: all has_packages: false @@ -67,18 +65,18 @@ variables: buildvariants: - <<: *linux-arm64-dynamic-compile-params name: &amazon-linux2-arm64-stitch-compile amazon-linux2-arm64-stitch-compile - display_name: "* Amazon Linux 2 arm64 Stitch Compile" + display_name: "* Amazon Linux 2 arm64 Enterprise Stitch Compile" expansions: - <<: *linux-arm64-dynamic-compile-expansions + <<: *linux-arm64-dynamic-enterprise-compile-expansions compile_variant: *amazon-linux2-arm64-stitch-compile tasks: - name: .stitch - <<: *linux-arm64-dynamic-compile-params name: &amazon-linux2-arm64-dev-compile amazon-linux2-arm64-dev-compile - display_name: "* Amazon Linux 2 arm64 Dev Compile" + display_name: "* Amazon Linux 2 arm64 Enterprise Dev Compile" expansions: - <<: *linux-arm64-dynamic-compile-expansions + <<: *linux-arm64-dynamic-enterprise-compile-expansions compile_variant: *amazon-linux2-arm64-dev-compile tasks: - name: scons_compile_smoke_test_TG @@ -87,7 +85,7 @@ buildvariants: # Note that this task is currently optional; # This will eventually become suggested, then required. - name: &amazon-linux-2023-arm64-bazel-compile amazon-linux-2023-arm64-bazel-compile - display_name: "Amazon Linux 2023 arm64 Bazel Compile" + display_name: "Amazon Linux 2023 Enterprise arm64 Bazel Compile" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] run_on: @@ -144,8 +142,6 @@ buildvariants: name: &enterprise-amazon-linux2-arm64-all-feature-flags enterprise-amazon-linux2-arm64-all-feature-flags display_name: "! Amazon Linux 2 arm64 Enterprise (all feature flags)" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter - modules: - - enterprise run_on: - amazon2-arm64-small stepback: true @@ -276,7 +272,7 @@ buildvariants: - &enterprise-amazon-linux2-arm64-all-feature-flags-fuzzers <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template name: enterprise-amazon-linux2-arm64-all-feature-flags-fuzzers - display_name: "*| Amazon Linux 2 arm64 (all feature flags) Fuzzers" + display_name: "*| Amazon Linux 2 arm64 Enterprise (all feature flags) Fuzzers" tasks: - name: .aggfuzzer - name: .change_stream_fuzzer @@ -285,10 +281,8 @@ buildvariants: - <<: *amazon_linux2_arm64_dynamic_compile_variant_dependency name: &amazon-linux2-arm64-fixed-concurrent-transactions amazon-linux2-arm64-fixed-concurrent-transactions - display_name: "Amazon Linux 2 arm64 (Fixed Concurrent Transactions)" + display_name: "Amazon Linux 2 arm64 Enterprise (Fixed Concurrent Transactions)" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter - modules: - - enterprise run_on: - amazon2-arm64-small expansions: @@ -389,11 +383,9 @@ buildvariants: - name: vector_search_auth - name: vector_search_ssl -- name: &al2023-arm64-sep-benchmark al2023-arm64-sep-benchmark - display_name: "AL2023 arm64 (SEP Benchmark)" + name: &al2023-arm64-sep-benchmark al2023-arm64-sep-benchmark + display_name: "AL2023 arm64 Enterprise (SEP Benchmark)" cron: "0 0,8,16 * * *" # Run this task every 8 hours - modules: - - enterprise run_on: - amazon2023.0-arm64-large expansions: diff --git a/etc/evergreen_yml_components/variants/amazon/test_release.yml b/etc/evergreen_yml_components/variants/amazon/test_release.yml index b90302ab39b..447f5ca1139 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_release.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_release.yml @@ -5,8 +5,6 @@ buildvariants: - name: enterprise-amazon2-openssl111 display_name: "Enterprise Amazon Linux 2 (openssl 1.1.1)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - amazon2-openssl111-small expansions: @@ -54,8 +52,6 @@ buildvariants: - name: enterprise-amazon2-arm64-openssl111 display_name: "Enterprise Amazon Linux 2 arm64 (openssl 1.1.1)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - amazon2-arm64-openssl111-small expansions: @@ -117,7 +113,10 @@ buildvariants: MONGO_DISTMOD=amazon2023 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_external_data_source,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=incompatible_with_amazon_linux,requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off has_packages: true packager_script: packager.py packager_arch: x86_64 @@ -139,8 +138,6 @@ buildvariants: - name: enterprise-amazon2023 display_name: "Enterprise Amazon Linux 2023" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - amazon2023.0-small expansions: @@ -184,8 +181,6 @@ buildvariants: # TODO(SERVER-85904): Re-enable this to run in nightly once Bazel supports LTO. # cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. activate: false - modules: - - enterprise run_on: - amazon2023.0-small expansions: @@ -244,7 +239,10 @@ buildvariants: BAZEL_BUILD_ENABLED=1 BAZEL_INTEGRATION_DEBUG=1 BAZEL_FLAGS="--subcommands --verbose_failures --sandbox_debug" - test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_external_data_source,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=incompatible_with_amazon_linux,requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off has_packages: true packager_script: packager.py packager_arch: aarch64 @@ -266,8 +264,6 @@ buildvariants: - name: enterprise-amazon2023-arm64 display_name: "Enterprise Amazon Linux 2023 arm64" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - amazon2023.0-arm64-small expansions: @@ -313,8 +309,6 @@ buildvariants: # TODO(SERVER-85904): Re-enable this to run in nightly once Bazel supports LTO. # cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. activate: false - modules: - - enterprise run_on: - amazon2023.0-arm64-small expansions: @@ -358,8 +352,6 @@ buildvariants: - name: enterprise-amazon2-streams display_name: "Amazon Linux 2 enterprise build with streams" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - amazon2-test expansions: diff --git a/etc/evergreen_yml_components/variants/atlas/test_release.yml b/etc/evergreen_yml_components/variants/atlas/test_release.yml index ff8befd04bb..44e30234958 100644 --- a/etc/evergreen_yml_components/variants/atlas/test_release.yml +++ b/etc/evergreen_yml_components/variants/atlas/test_release.yml @@ -5,8 +5,6 @@ buildvariants: - name: enterprise-rhel-79-64-bit display_name: "Enterprise RHEL 7.9" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel7.9-small expansions: diff --git a/etc/evergreen_yml_components/variants/debian/test_release.yml b/etc/evergreen_yml_components/variants/debian/test_release.yml index 305af2e9c1c..dcca3f154c2 100644 --- a/etc/evergreen_yml_components/variants/debian/test_release.yml +++ b/etc/evergreen_yml_components/variants/debian/test_release.yml @@ -5,8 +5,6 @@ buildvariants: - name: enterprise-debian10-64 display_name: Jepsen Tests on Enterprise Debian 10 cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - debian10-test expansions: @@ -41,7 +39,10 @@ buildvariants: MONGO_DISTMOD=debian12 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off multiversion_platform: debian12 multiversion_edition: targeted has_packages: true @@ -65,8 +66,6 @@ buildvariants: - name: enterprise-debian12-64 display_name: Enterprise Debian 12 cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - debian12-small expansions: diff --git a/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml index c0bf5f5e5bc..95d00da269d 100644 --- a/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml +++ b/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml @@ -5,8 +5,6 @@ buildvariants: - &enterprise-rhel-81-ppc64le-template 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 @@ -90,8 +88,6 @@ buildvariants: - &enterprise-rhel-83-s390x-template name: enterprise-rhel-83-s390x display_name: Enterprise RHEL 8.3 s390x - modules: - - enterprise run_on: - rhel83-zseries-small cron: "0 4 * * 0" diff --git a/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml index bc453911a8f..0a021d4a13d 100644 --- a/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml @@ -11,7 +11,9 @@ buildvariants: run_on: - macos-1100 expansions: - test_flags: --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + test_flags: >- + --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off push_path: osx push_bucket: downloads.mongodb.org push_name: macos @@ -22,6 +24,7 @@ buildvariants: -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx_arm.vars + --modules= resmoke_jobs_max: 6 compile_variant: *macos-amd64-bazel-compile tasks: @@ -37,7 +40,9 @@ buildvariants: run_on: - macos-1100-arm64 expansions: - test_flags: --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + test_flags: >- + --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off push_path: osx push_bucket: downloads.mongodb.org push_name: macos @@ -48,6 +53,7 @@ buildvariants: -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx_arm.vars + --modules= resmoke_jobs_max: 6 compile_variant: *macos-arm64-bazel-compile tasks: @@ -56,8 +62,6 @@ buildvariants: - name: &enterprise-macos-arm64 enterprise-macos-arm64 display_name: "~ Enterprise macOS arm64" - modules: - - enterprise run_on: - macos-1100-arm64 expansions: diff --git a/etc/evergreen_yml_components/variants/macos/test_release.yml b/etc/evergreen_yml_components/variants/macos/test_release.yml index 5f487c8824e..83cbbf505cc 100644 --- a/etc/evergreen_yml_components/variants/macos/test_release.yml +++ b/etc/evergreen_yml_components/variants/macos/test_release.yml @@ -8,7 +8,9 @@ buildvariants: run_on: - macos-1100 expansions: - test_flags: --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + test_flags: >- + --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off push_path: osx push_bucket: downloads.mongodb.org push_name: macos @@ -19,6 +21,7 @@ buildvariants: -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx.vars + --modules= resmoke_jobs_max: 6 compile_variant: macos tasks: @@ -41,7 +44,9 @@ buildvariants: run_on: - macos-1100-arm64 expansions: - test_flags: --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + test_flags: >- + --excludeWithAnyTags=incompatible_with_macos,requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off push_path: osx push_bucket: downloads.mongodb.org push_name: macos @@ -52,6 +57,7 @@ buildvariants: -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx_arm.vars + --modules= resmoke_jobs_max: 6 compile_variant: macos-arm64 tasks: @@ -71,8 +77,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: @@ -108,8 +112,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: diff --git a/etc/evergreen_yml_components/variants/misc/misc.yml b/etc/evergreen_yml_components/variants/misc/misc.yml index 7c09e342f87..cada3a09794 100644 --- a/etc/evergreen_yml_components/variants/misc/misc.yml +++ b/etc/evergreen_yml_components/variants/misc/misc.yml @@ -36,8 +36,6 @@ buildvariants: - name: burn_in_tags_gen - name: ©bara-sync-between-repos copybara-sync-between-repos - modules: - - enterprise display_name: "* Copybara Sync Between Repos" activate: true run_on: @@ -50,8 +48,6 @@ buildvariants: - name: enterprise-windows-ninja display_name: "Ninja Build: Enterprise Windows" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise expansions: compile_flags: >- --ssl @@ -72,8 +68,6 @@ buildvariants: - name: macos-enterprise-ninja display_name: "Ninja Build: macOS Enterprise" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - macos-1100 expansions: @@ -87,8 +81,6 @@ buildvariants: - name: macos-ninja-build-profiles display_name: "Ninja Build Profiles: macOS" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - macos-1100 expansions: @@ -103,8 +95,6 @@ buildvariants: - name: macos-arm-ninja-build-profiles display_name: "Ninja Build Profiles: macOS ARM" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - macos-1100-arm64 expansions: @@ -119,8 +109,6 @@ buildvariants: - name: windows-ninja-build-profiles display_name: "Ninja Build Profiles: Windows" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise expansions: compile_flags: >- --ssl @@ -146,8 +134,6 @@ buildvariants: - name: ubuntu1804-ninja-build-profiles display_name: "Ninja Build Profiles: Ubuntu 18.04" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - ubuntu1804-small stepback: false @@ -176,8 +162,6 @@ buildvariants: - name: enterprise-rhel-80-64-bit-dynamic-ninja display_name: "Ninja Build: Enterprise RHEL 8.0" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel80-small expansions: diff --git a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml index 4b32e4c5c95..08155c08562 100644 --- a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml @@ -23,8 +23,6 @@ buildvariants: display_name: "~ Build Metrics Enterprise MacOS" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. stepback: false - modules: - - enterprise run_on: - macos-1100 expansions: @@ -42,8 +40,6 @@ buildvariants: display_name: "~ Build Metrics Enterprise RHEL 8.0 " cron: "0 4 * * *" # From the ${project_nightly_cron} parameter stepback: false - modules: - - enterprise run_on: - rhel80-build expansions: @@ -62,8 +58,6 @@ buildvariants: display_name: "~ Build Metrics Enterprise AL22 ARM" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter stepback: false - modules: - - enterprise run_on: - amazon2023.0-arm64-large expansions: @@ -98,8 +92,6 @@ buildvariants: - name: win_shared_scons_cache_pruning - name: &stm-daily-cron stm-daily-cron - modules: - - enterprise display_name: "* STM Daily Cron" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: diff --git a/etc/evergreen_yml_components/variants/misc/task_generation.yml b/etc/evergreen_yml_components/variants/misc/task_generation.yml index ae952462c2a..4c5c81f4e2c 100644 --- a/etc/evergreen_yml_components/variants/misc/task_generation.yml +++ b/etc/evergreen_yml_components/variants/misc/task_generation.yml @@ -5,8 +5,6 @@ buildvariants: display_name: "Generate tasks for evergreen version" batchtime: 0 activate: true - modules: - - enterprise run_on: - rhel80-medium tasks: diff --git a/etc/evergreen_yml_components/variants/perf/perf.yml b/etc/evergreen_yml_components/variants/perf/perf.yml index 72f11a9b7ff..36a55f8b934 100644 --- a/etc/evergreen_yml_components/variants/perf/perf.yml +++ b/etc/evergreen_yml_components/variants/perf/perf.yml @@ -76,7 +76,6 @@ variables: num_scons_link_jobs_available: 0.99 - modules: &perf_modules - - enterprise - dsi - genny - workloads diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev.yml b/etc/evergreen_yml_components/variants/rhel/test_dev.yml index d37021f547f..1dea7d0ed7c 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev.yml @@ -10,15 +10,13 @@ variables: run_on: - rhel80-xlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. - modules: - - enterprise stepback: false # THIS HAS COPIES IN: # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml # - etc/evergreen_yml_components/variants/rhel/test_dev.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES -- &linux-x86-dynamic-compile-expansions +- &linux-x86-dynamic-enterprise-compile-expansions scons_cache_scope: shared scons_cache_mode: all has_packages: false @@ -130,9 +128,9 @@ variables: buildvariants: - <<: *linux-x86-dynamic-compile-params name: &linux-x86-dynamic-compile linux-x86-dynamic-compile - display_name: "* Linux x86 Shared Library" + display_name: "* Linux x86 Enterprise Shared Library" expansions: - <<: *linux-x86-dynamic-compile-expansions + <<: *linux-x86-dynamic-enterprise-compile-expansions compile_variant: *linux-x86-dynamic-compile tasks: - name: compile_ninja_quick_TG @@ -154,8 +152,6 @@ buildvariants: name: &enterprise-rhel-80-64-bit-dynamic enterprise-rhel-80-64-bit-dynamic 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: @@ -271,8 +267,6 @@ buildvariants: # name: enterprise-rhel-80-64-bit-dynamic-config-shard # display_name: "* Shared Library Enterprise RHEL 8.0 (Config Shard)" # cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. -# modules: -# - enterprise # run_on: # - rhel80-small # stepback: false @@ -323,8 +317,6 @@ buildvariants: name: enterprise-rhel-80-64-bit-dynamic-embedded-router display_name: "* Shared Library Enterprise RHEL 8.0 (Embedded Router all feature flags)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel80-small stepback: false @@ -343,8 +335,6 @@ buildvariants: name: enterprise-rhel-80-64-bit-dynamic-classic-engine display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel80-small stepback: false @@ -470,8 +460,6 @@ buildvariants: name: &rhel80-debug-aubsan-classic-engine rhel80-debug-aubsan-classic-engine display_name: "* {A,UB}SAN Enterprise RHEL 8.0 DEBUG (Classic Engine)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel80-build expansions: diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml index 33fead6edab..47e1b8e734e 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml @@ -5,8 +5,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: diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml index 173cbe737b3..fbc58bd42e2 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml @@ -10,15 +10,13 @@ variables: run_on: - rhel80-xlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. - modules: - - enterprise stepback: false # THIS HAS COPIES IN: # - etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml # - etc/evergreen_yml_components/variants/rhel/test_dev.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES -- &linux-x86-dynamic-compile-expansions +- &linux-x86-dynamic-enterprise-compile-expansions scons_cache_scope: shared scons_cache_mode: all has_packages: false @@ -108,8 +106,6 @@ variables: name: enterprise-rhel-79-64-bit display_name: "Enterprise RHEL 7.9" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel7.9-small expansions: &enterprise-rhel-79-64-bit-expansions-template @@ -183,10 +179,8 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-x86-dynamic-compile-future-tag-multiversion linux-x86-dynamic-compile-future-tag-multiversion display_name: "Linux x86 Shared Library Compile (future git tag multiversion)" - modules: - - enterprise expansions: - <<: *linux-x86-dynamic-compile-expansions + <<: *linux-x86-dynamic-enterprise-compile-expansions bv_future_git_tag: r100.0.0-9999 compile_variant: *linux-x86-dynamic-compile-future-tag-multiversion tasks: @@ -197,7 +191,7 @@ buildvariants: name: &linux-stitch-compile-suggested linux-stitch-compile-suggested display_name: "* Linux x86 Stitch Enterprise Compile" expansions: - <<: *linux-x86-dynamic-compile-expansions + <<: *linux-x86-dynamic-enterprise-compile-expansions compile_variant: *linux-stitch-compile-suggested tasks: - name: .stitch @@ -206,7 +200,7 @@ buildvariants: name: &linux-crypt-compile linux-crypt-compile display_name: "* Linux x86 Crypt Enterprise Compile" expansions: - <<: *linux-x86-dynamic-compile-expansions + <<: *linux-x86-dynamic-enterprise-compile-expansions crypt_task_compile_flags: >- SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" @@ -218,9 +212,7 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-x86-dynamic-grpc-suggested linux-x86-dynamic-grpc-suggested - display_name: "* Linux x86 Shared Library with GRPC" - modules: - - enterprise + display_name: "* Linux x86 Shared Library Enterprise with GRPC" stepback: false expansions: <<: *generic_linux_compile_expansions @@ -267,8 +259,6 @@ buildvariants: name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags enterprise-rhel-80-64-bit-dynamic-all-feature-flags display_name: "* Shared Library Enterprise RHEL 8.0 (all feature flags)" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter - modules: - - enterprise run_on: - rhel80-small stepback: false @@ -425,8 +415,6 @@ buildvariants: - name: &enterprise-rhel-80-64-bit-suggested enterprise-rhel-80-64-bit-suggested display_name: "* Enterprise RHEL 8.0" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter - modules: - - enterprise run_on: - rhel80-build expansions: @@ -492,8 +480,6 @@ buildvariants: - name: &enterprise-rhel-80-benchmarks 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: @@ -513,8 +499,6 @@ buildvariants: name: &enterprise-rhel-80-64-bit-large-txns-format enterprise-rhel-80-64-bit-large-txns-format display_name: "Enterprise RHEL 8.0 (large transactions format)" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter - modules: - - enterprise run_on: - rhel80-small expansions: @@ -577,8 +561,6 @@ buildvariants: name: &enterprise-rhel-80-64-bit-multiversion 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: &linux-x86-multiversion-expansions-template @@ -672,8 +654,6 @@ buildvariants: - name: &enterprise-rhel80-no-latch-64-bit enterprise-rhel80-no-latch-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 @@ -701,8 +681,6 @@ buildvariants: - name: &enterprise-rhel80-sdam-replica-set-monitor-64-bit enterprise-rhel80-sdam-replica-set-monitor-64-bit display_name: "~ Enterprise RHEL 8.0 (with SdamReplicaSetMonitor)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel80-small expansions: @@ -745,8 +723,6 @@ buildvariants: - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit display_name: "~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"})" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel80-small expansions: @@ -790,8 +766,6 @@ buildvariants: cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small - modules: - - enterprise expansions: <<: *linux_x86_generic_expansions scons_cache_scope: shared @@ -838,8 +812,6 @@ buildvariants: cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small - modules: - - enterprise expansions: <<: *linux_x86_generic_expansions scons_cache_scope: shared @@ -886,8 +858,6 @@ buildvariants: activate: false run_on: - rhel80-small - modules: - - enterprise expansions: <<: *linux_x86_generic_expansions scons_cache_scope: shared @@ -938,8 +908,6 @@ buildvariants: - name: &enterprise-rhel-80-64-bit-dynamic-classic-engine-query-patch-only enterprise-rhel-80-64-bit-dynamic-classic-engine-query-patch-only display_name: "~ Shared Library Enterprise RHEL 8.0 Query Patch Only (Classic Engine)" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. - modules: - - enterprise run_on: - rhel80-small stepback: false diff --git a/etc/evergreen_yml_components/variants/rhel/test_release.yml b/etc/evergreen_yml_components/variants/rhel/test_release.yml index 102ead93431..5592e305787 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_release.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_release.yml @@ -15,10 +15,12 @@ buildvariants: --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars + --modules= tooltags: "" build_mongoreplay: true test_flags: >- --excludeWithAnyTags=requires_os_access,requires_latch_analyzer + --enableEnterpriseTests=off compile_variant: ubi8 tasks: - name: compile_and_archive_dist_test_TG @@ -34,8 +36,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 @@ -184,7 +184,10 @@ buildvariants: --ssl MONGO_DISTMOD=rhel82 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits,requires_latch_analyzer + --enableEnterpriseTests=off has_packages: true packager_script: packager.py packager_arch: aarch64 @@ -226,8 +229,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: @@ -303,8 +304,14 @@ 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_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + compile_flags: >- + --ssl MONGO_DISTMOD=rhel90 + -j$(grep -c ^processor /proc/cpuinfo) + --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off multiversion_platform: rhel90 multiversion_edition: targeted has_packages: true @@ -349,8 +356,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 @@ -434,7 +439,10 @@ buildvariants: --ssl MONGO_DISTMOD=rhel90 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off has_packages: true packager_script: packager.py packager_arch: aarch64 @@ -476,8 +484,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: @@ -548,8 +554,6 @@ buildvariants: - name: enterprise-rhel-82-arm64-grpc display_name: "Enterprise RHEL 8.2 arm64 GRPC" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - rhel82-arm64-large stepback: false diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml index 8f4bf4ea0a4..0b68220a68a 100644 --- a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml +++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml @@ -31,7 +31,7 @@ variables: # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml # - etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES -- &linux_debug_compile_expansions +- &linux_debug_community_compile_expansions <<: *generic_linux_compile_expansions compile_flags: >- --dbg=on @@ -41,6 +41,7 @@ variables: --enable-http-client=on --link-model=dynamic --use-diagnostic-latches=on + --modules= num_scons_link_jobs_available: 0.99 - &linux_x86_dynamic_debug_compile_variant_dependency @@ -117,7 +118,7 @@ buildvariants: display_name: "! Linux x86 Shared Library DEBUG Compile" stepback: false expansions: - <<: *linux_debug_compile_expansions + <<: *linux_debug_community_compile_expansions compile_variant: *linux-x86-dynamic-debug-compile-required tasks: - name: compile_test_parallel_core_stream_TG @@ -128,8 +129,6 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-debug-aubsan-compile-required linux-debug-aubsan-compile-required display_name: "! Linux x86 Shared Library {A,UB}SAN Enterprise Compile" - modules: - - enterprise expansions: <<: *generic_linux_compile_expansions separate_debug: off @@ -156,7 +155,9 @@ buildvariants: - rhel80-medium expansions: resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's - test_flags: --excludeWithAnyTags=requires_http_client + test_flags: >- + --excludeWithAnyTags=requires_http_client + --enableEnterpriseTests=off target_resmoke_time: 15 max_sub_suites: 5 large_distro_name: rhel80-medium @@ -198,8 +199,6 @@ buildvariants: name: &rhel80-debug-aubsan-lite rhel80-debug-aubsan-lite 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 expansions: @@ -228,12 +227,15 @@ buildvariants: -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --use-diagnostic-latches=on + --modules= multiversion_platform: rhel80 multiversion_edition: enterprise resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under ASAN build. hang_analyzer_dump_core: false scons_cache_scope: shared - test_flags: --excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling,corrupts_data + test_flags: >- + --excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling,corrupts_data + --enableEnterpriseTests=off separate_debug: off compile_variant: rhel80-asan tasks: @@ -246,8 +248,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 @@ -337,8 +337,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 @@ -423,8 +421,6 @@ buildvariants: name: &rhel80-debug-aubsan-lite_fuzzer 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 diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml index 757c5dd62e1..eb602d3d885 100644 --- a/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml @@ -116,8 +116,6 @@ buildvariants: - name: &enterprise-rhel-80-64-bit-dynamic-debug-mode enterprise-rhel-80-64-bit-dynamic-debug-mode display_name: "Shared Library Enterprise RHEL 8.0 Debug Mode" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter - modules: - - enterprise run_on: - rhel80-small stepback: false @@ -271,6 +269,7 @@ buildvariants: -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.8") MONGO_DISTMOD=windows --use-diagnostic-latches=on + --modules= num_scons_link_jobs_available: 0.2 python: '/cygdrive/c/python/python310/python.exe' ext: zip @@ -278,7 +277,9 @@ 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: >- + --excludeWithAnyTags=incompatible_with_windows_tls + --enableEnterpriseTests=off compile_variant: *windows-debug-suggested tasks: - name: compile_test_serial_TG @@ -340,8 +341,6 @@ buildvariants: - name: &enterprise-windows-debug-unoptimized 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: @@ -366,7 +365,8 @@ buildvariants: ext: zip resmoke_jobs_max: 1 scons_cache_scope: shared - test_flags: *windows_common_test_excludes + test_flags: >- + --excludeWithAnyTags=incompatible_with_windows_tls tasks: # This variant tests that unoptimized, DEBUG mongos and mongod binaries can run on Windows. # It has a minimal amount of tasks because unoptimized builds are slow, which causes @@ -392,7 +392,9 @@ buildvariants: - macos-1100 expansions: &macos-debug-expansions compile_variant: *macos-debug-suggested - 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: >- @@ -403,6 +405,7 @@ buildvariants: --libc++ --variables-files=etc/scons/xcode_macosx.vars --use-diagnostic-latches=on + --modules= num_scons_link_jobs_available: 0.99 tasks: - name: compile_test_serial_TG @@ -419,8 +422,6 @@ buildvariants: - name: &enterprise-macos enterprise-macos display_name: "Enterprise macOS DEBUG" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - macos-1100 expansions: @@ -457,8 +458,6 @@ buildvariants: name: &rhel80-debug-ubsan-all-feature-flags 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 @@ -503,8 +502,6 @@ buildvariants: name: &rhel80-debug-aubsan-lite-all-feature-flags-required rhel80-debug-aubsan-lite-all-feature-flags-required display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG (all feature flags)" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter - modules: - - enterprise run_on: - rhel80-build expansions: @@ -603,8 +600,6 @@ buildvariants: name: &enterprise-rhel80-debug-tsan 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 @@ -759,8 +754,6 @@ buildvariants: display_name: "~ TSAN Enterprise RHEL 8.0 COMPLETE DEBUG" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. activate: false - modules: - - enterprise run_on: - rhel80-large stepback: false @@ -788,8 +781,6 @@ buildvariants: - name: &enterprise-rhel80-unoptimized-64-bit enterprise-rhel80-unoptimized-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 diff --git a/etc/evergreen_yml_components/variants/suse/test_release.yml b/etc/evergreen_yml_components/variants/suse/test_release.yml index 5171c60e4fe..5566f60549d 100644 --- a/etc/evergreen_yml_components/variants/suse/test_release.yml +++ b/etc/evergreen_yml_components/variants/suse/test_release.yml @@ -5,8 +5,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: @@ -59,7 +57,10 @@ buildvariants: MONGO_DISTMOD=suse15 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits,requires_latch_analyzer + --enableEnterpriseTests=off multiversion_platform: suse15 multiversion_edition: targeted has_packages: true diff --git a/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml index b252e9552ad..43c6b82b425 100644 --- a/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml @@ -3,8 +3,6 @@ variables: - &enterprise-ubuntu2204-64-libvoidstar-template - modules: - - enterprise run_on: - ubuntu2204-large stepback: false @@ -24,7 +22,7 @@ buildvariants: # Note that this task is currently optional; # This will eventually become suggested, then required. - name: &ubuntu2204-arm64-bazel-compile ubuntu2204-arm64-bazel-compile - display_name: "! Ubuntu 22.04 arm64 Bazel Compile" + display_name: "! Ubuntu 22.04 arm64 Enterprise Bazel Compile" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] run_on: @@ -42,7 +40,7 @@ buildvariants: - ubuntu2204-arm64-large - name: &ubuntu2204-x86-64-bazel-compile ubuntu2204-x86-64-bazel-compile - display_name: "Ubuntu 22.04 x86_64 Bazel Compile" + display_name: "Ubuntu 22.04 x86_64 Enterprise Bazel Compile" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] run_on: diff --git a/etc/evergreen_yml_components/variants/ubuntu/test_release.yml b/etc/evergreen_yml_components/variants/ubuntu/test_release.yml index 383a6ab5f4f..5cc34cfc1c8 100644 --- a/etc/evergreen_yml_components/variants/ubuntu/test_release.yml +++ b/etc/evergreen_yml_components/variants/ubuntu/test_release.yml @@ -5,8 +5,6 @@ buildvariants: - name: enterprise-ubuntu1804-64 display_name: Jepsen Tests on Enterprise Ubuntu 18.04 cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. - modules: - - enterprise run_on: - ubuntu1804-small # TODO SERVER-86538 see if we can use --allocator=tcmalloc-google on @@ -44,7 +42,10 @@ buildvariants: MONGO_DISTMOD=ubuntu2204 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits,requires_latch_analyzer + --enableEnterpriseTests=off multiversion_platform: ubuntu2204 multiversion_edition: targeted has_packages: true @@ -80,7 +81,10 @@ buildvariants: MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off multiversion_platform: ubuntu2004 multiversion_edition: targeted has_packages: true @@ -104,8 +108,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 @@ -151,8 +153,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 @@ -202,8 +202,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 expansions: @@ -260,7 +258,10 @@ buildvariants: MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers has_packages: true packager_script: packager.py @@ -286,8 +287,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-small expansions: @@ -335,8 +334,14 @@ 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_stable_gcc.vars - test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + compile_flags: >- + --ssl MONGO_DISTMOD=ubuntu2204 + -j$(grep -c ^processor /proc/cpuinfo) + --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars + --modules= + test_flags: >- + --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers has_packages: true packager_script: packager.py diff --git a/etc/evergreen_yml_components/variants/windows/test_dev.yml b/etc/evergreen_yml_components/variants/windows/test_dev.yml index 6b837e625ad..b149d5e4322 100644 --- a/etc/evergreen_yml_components/variants/windows/test_dev.yml +++ b/etc/evergreen_yml_components/variants/windows/test_dev.yml @@ -45,11 +45,9 @@ variables: buildvariants: - name: &windows-compile-required windows-compile-required - display_name: "! Windows Compile" + display_name: "! Windows Enterprise Compile" run_on: - windows-vsCurrent-xxlarge - modules: - - enterprise activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. expansions: exe: ".exe" @@ -87,8 +85,6 @@ buildvariants: name: &enterprise-windows-suggested enterprise-windows-suggested display_name: "* Enterprise Windows" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter - modules: - - enterprise run_on: - windows-vsCurrent-small expansions: diff --git a/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml index 09296b734ec..dd1092d6ca2 100644 --- a/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml +++ b/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml @@ -5,8 +5,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: diff --git a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml index 2b5751ae1b8..cdf425a7f90 100644 --- a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml @@ -47,7 +47,7 @@ buildvariants: # Note that this task is currently optional; # This will eventually become suggested, then required. - name: &windows-bazel-compile windows-bazel-compile - display_name: "Windows Bazel Compile" + display_name: "Windows Enterprise Bazel Compile" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] run_on: @@ -71,11 +71,9 @@ buildvariants: - name: compile_bazel_ninja_TG - name: &windows-dev-compile-suggested windows-dev-compile-suggested - display_name: "* Windows Dev Compile" + display_name: "* Windows Enterprise Dev Compile" run_on: - windows-vsCurrent-xlarge - modules: - - enterprise expansions: exe: ".exe" ext: zip @@ -92,7 +90,7 @@ buildvariants: - name: ninja_compile_smoke_test_TG - name: &windows-dynamic-visibility-test windows-dynamic-visibility-test - display_name: "~ Shared Library Windows (visibility test)" + display_name: "~ Shared Library Windows Enterprise (visibility test)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: # --link-model=dynamic is set by visiblity_test's task_compile_flags @@ -116,12 +114,10 @@ buildvariants: ### QO & QE Patch-Specific Build Variants ### - name: &windows-compile-query-patch-only windows-compile-query-patch-only - display_name: "~ Windows Compile Query Patch Only" + display_name: "~ Windows Enterprise Compile Query Patch Only" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. run_on: - windows-vsCurrent-small - modules: - - enterprise expansions: additional_package_targets: >- archive-mongocryptd @@ -157,8 +153,6 @@ buildvariants: name: &enterprise-windows-all-feature-flags-required enterprise-windows-all-feature-flags-required display_name: "! Enterprise Windows (all feature flags)" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter - modules: - - enterprise run_on: - windows-vsCurrent-small expansions: @@ -234,8 +228,6 @@ buildvariants: cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-large # To accommodate OOD issues noted in BF-31698 - modules: - - enterprise expansions: additional_package_targets: >- archive-mongocryptd diff --git a/etc/evergreen_yml_components/variants/windows/test_release.yml b/etc/evergreen_yml_components/variants/windows/test_release.yml index ca0323f11c8..12c0a649578 100644 --- a/etc/evergreen_yml_components/variants/windows/test_release.yml +++ b/etc/evergreen_yml_components/variants/windows/test_release.yml @@ -22,12 +22,15 @@ buildvariants: 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/python310/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,requires_external_data_source,requires_latch_analyzer + test_flags: >- + --excludeWithAnyTags=incompatible_with_windows_tls,requires_external_data_source,requires_latch_analyzer + --enableEnterpriseTests=off compile_variant: windows tasks: - name: compile_test_and_package_serial_no_unittests_TG @@ -67,8 +70,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: @@ -99,7 +100,7 @@ buildvariants: push_bucket: downloads.10gen.com push_name: windows push_arch: x86_64-enterprise - test_flags: *windows_common_test_excludes + test_flags: --excludeWithAnyTags=incompatible_with_windows_tls,requires_external_data_source,requires_latch_analyzer exec_timeout_secs: 14400 # 3 hour timeout compile_variant: enterprise-windows tasks: diff --git a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml index 2fa7bfcd15f..70f1436ef50 100644 --- a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml @@ -31,7 +31,7 @@ variables: # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml # - etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES -- &linux_debug_compile_expansions +- &linux_debug_community_compile_expansions <<: *generic_linux_compile_expansions compile_flags: >- --dbg=on @@ -41,6 +41,7 @@ variables: --enable-http-client=on --link-model=dynamic --use-diagnostic-latches=on + --modules= num_scons_link_jobs_available: 0.99 @@ -52,7 +53,7 @@ buildvariants: modules: - wtdevelop expansions: - <<: *linux_debug_compile_expansions + <<: *linux_debug_community_compile_expansions use_wt_develop: true compile_variant: *linux-x86-dynamic-debug-wtdevelop-compile @@ -85,10 +86,13 @@ buildvariants: --enable-http-client=on --link-model=dynamic --use-diagnostic-latches=on + --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 compile_variant: *linux_x86_dynamic_debug_wtdevelop_compile_variant_name tasks: - name: .aggregation !.encrypt !.feature_flag_guarded @@ -126,7 +130,6 @@ buildvariants: run_on: - windows-vsCurrent-small modules: - - enterprise - wtdevelop expansions: additional_package_targets: >- diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 5ae689c4fcf..45b17121e00 100755 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -81,7 +81,6 @@ variables: _src_dir: &src_dir src/mongo _modules: &modules - - enterprise - mongo-tools # - mongo - dsi @@ -172,11 +171,6 @@ modules: # prefix: ${workdir}/src # branch: master ### - - name: enterprise - owner: 10gen - repo: mongo-enterprise-modules - prefix: src/mongo/db/modules - branch: master # Pinned to version 100.7.2 - name: mongo-tools owner: mongodb diff --git a/evergreen/feature_flag_tags_check.sh b/evergreen/feature_flag_tags_check.sh index 825591d5b41..3d2cf818142 100755 --- a/evergreen/feature_flag_tags_check.sh +++ b/evergreen/feature_flag_tags_check.sh @@ -21,14 +21,6 @@ if [ -s "$diff_file_name" ]; then git apply -R "$diff_file_name" fi -# This script has to be run on an Evergreen variant or local repo with the enterprise module. -pushd "$enterprise_path" -git --no-pager diff "$(git merge-base origin/${branch_name} HEAD)" --output="$diff_file_name" --binary -if [ -s "$diff_file_name" ]; then - git apply -R "$diff_file_name" -fi -popd - $python buildscripts/idl/gen_all_feature_flag_list.py mv all_feature_flags.txt base_all_feature_flags.txt