SERVER-82094: AL 2023 v6.0 (#19132)

GitOrigin-RevId: dc861b4380eac61d2803974eff1ac82e95767426
2024-03-05 11:13:26 -05:00 · 2024-03-05 11:13:26 -05:00 · 55af7af9bd
parent bde5d91b4d
commit 55af7af9bd
11 changed files with 236 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,6 @@
 /build
-/src/mongo/db/modules/*
+/src/mongo/db/modules/**
 !/src/mongo/db/modules/enterprise/
-/src/mongo/db/modules
 /.jsdbshell
 /.cache
 /.dbshell
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@ -44,7 +44,7 @@ import time
 ARCH_CHOICES = ["x86_64", "arm64", "aarch64", "s390x"]

 # Made up names for the flavors of distribution we package for.
-DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2"]
+DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2", "amazon2023"]


 class Spec(object):
@ -291,6 +291,8 @@ class Distro(object):
            return "2013.03"
        elif self.dname == 'amazon2':
            return "2017.12"
+        elif self.dname == 'amazon2023':
+            return "2023.0"
        elif self.dname == 'ubuntu':
            if build_os == 'ubuntu1204':
                return "precise"
@ -354,7 +356,7 @@ class Distro(object):
                "rhel55",
                "rhel67",
            ]
-        elif self.dname in ['amazon', 'amazon2']:
+        elif self.dname in ['amazon', 'amazon2', 'amazon2023']:
            return [self.dname]
        elif self.dname == 'ubuntu':
            return [
@ -382,6 +384,8 @@ class Distro(object):
            return 'amzn1'
        elif self.dname == 'amazon2':
            return 'amzn2'
+        elif self.dname == 'amazon2023':
+            return 'amzn2023'
        return re.sub(r'^rh(el\d).*$', r'\1', build_os)


--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@ -44,7 +44,7 @@ import packager  # pylint: disable=wrong-import-position
 ARCH_CHOICES = ["x86_64", "ppc64le", "s390x", "arm64", "aarch64"]

 # Made up names for the flavors of distribution we package for.
-DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2"]
+DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2", "amazon2023"]


 class EnterpriseSpec(packager.Spec):
@ -145,6 +145,8 @@ class EnterpriseDistro(packager.Distro):
                return ["rhel82", "rhel90"]
            if self.dname == 'amazon2':
                return ["amazon2"]
+            if self.dname == 'amazon2023':
+                return ["amazon2023"]
            return []

        if re.search("(redhat|fedora|centos)", self.dname):
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@ -297,6 +297,8 @@ variables:
  - enterprise-amazon2-openssl111
  - enterprise-amazon2-arm64
  - enterprise-amazon2-arm64-openssl111
+  - enterprise-amazon2023
+  - enterprise-amazon2023-arm64
  - enterprise-debian10-64
  - enterprise-debian11-64
  - enterprise-linux-64-amazon-ami
@ -348,6 +350,8 @@ variables:
  - enterprise-rhel-90-64-bit
  - enterprise-rhel-90-arm64
  - enterprise-amazon2-arm64
+  - enterprise-amazon2023
+  - enterprise-amazon2023-arm64
  - enterprise-ubuntu1804-64
  - enterprise-ubuntu2204-64
  - enterprise-windows
@ -358,10 +362,14 @@ variables:
  - amazon
  - enterprise-linux-64-amazon-ami
  - amazon2
+  - amazon2023
+  - amazon2023-arm64
  - enterprise-amazon2
  - enterprise-amazon2-openssl111
  - enterprise-amazon2-arm64
  - enterprise-amazon2-arm64-openssl111
+  - enterprise-amazon2023
+  - enterprise-amazon2023-arm64
  - debian10
  - debian11
  - enterprise-debian10-64
--- a/etc/evergreen_yml_components/variants/misc_release.yml
+++ b/etc/evergreen_yml_components/variants/misc_release.yml
@ -279,6 +279,202 @@ buildvariants:
  - name: vector_search_auth
  - name: vector_search_ssl

+- name: amazon2023
+  display_name: Amazon Linux 2023
+  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
+  run_on:
+  - amazon2023.0-small
+  expansions:
+    push_path: linux
+    push_bucket: downloads.mongodb.org
+    push_name: linux
+    push_arch: x86_64-amazon2023
+    compile_flags: --ssl MONGO_DISTMOD=amazon2023 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --use-diagnostic-latches=off --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
+    packager_distro: amazon2023
+    repo_edition: org
+    scons_cache_scope: shared
+    large_distro_name: amazon2023.0-large
+    compile_variant: amazon2023
+  tasks:
+  - name: compile_test_and_package_serial_TG
+    distros:
+    - amazon2023.0-large
+  - name: .aggfuzzer .common !.multiversion
+  - name: aggregation
+  - name: .auth !.audit !.multiversion
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js !.parallel
+  - name: .concurrency .common
+    distros:
+    - amazon2023.0-large
+  - name: concurrency_replication_causal_consistency_gen
+  - name: disk_wiredtiger
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: libunwind_tests
+  - name: .logical_session_cache .one_sec
+  - name: replica_sets_gen
+  - name: .replica_sets .common
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.csrs !.multiversion
+  - name: .sharding .txns
+  - name: .ssl
+  - name: .stitch
+  - name: .publish
+  - name: generate_buildid_to_debug_symbols_mapping
+
+- name: enterprise-amazon2023
+  display_name: "Enterprise Amazon Linux 2023"
+  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
+  run_on:
+  - amazon2023.0-small
+  expansions:
+    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
+    push_path: linux
+    push_bucket: downloads.10gen.com
+    push_name: linux
+    push_arch: x86_64-enterprise-amazon2023
+    compile_flags: --ssl MONGO_DISTMOD=amazon2023 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --use-diagnostic-latches=off --enterprise-features="audit,encryptdb,fcbis,fips,fle,hot_backups,inmemory,kerberos,vector_search,ldap,live_import,mongohouse,queryable,sasl,search,serverless"
+    crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
+    # TODO BUILD-13887 should fix uses_pykmip incompatibility.
+    test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip,requires_v4_0,requires_external_data_source,requires_latch_analyzer
+    has_packages: true
+    multiversion_platform: amazon2023
+    multiversion_edition: enterprise
+    multiversion_architecture: x86_64
+    packager_script: packager_enterprise.py
+    packager_arch: x86_64
+    packager_distro: amazon2023
+    repo_edition: enterprise
+    scons_cache_scope: shared
+    compile_variant: enterprise-amazon2023
+  tasks:
+  - name: compile_test_and_package_serial_TG
+    distros:
+    - amazon2023.0-large
+  - name: .aggfuzzer .common !.multiversion
+  - name: aggregation
+  - name: audit
+  - name: .auth !.multiversion
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .encrypt !.aggregation
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: libunwind_tests
+  - name: .logical_session_cache .one_sec
+  - name: noPassthrough_gen
+  - name: noPassthroughWithMongod_gen
+  - name: .replica_sets .common
+  - name: sasl
+  - name: serial_run
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .txns !.csrs
+  - name: slow1_gen
+  - name: .publish
+  - name: generate_buildid_to_debug_symbols_mapping
+
+- name: amazon2023-arm64
+  display_name: Amazon Linux 2023 arm64
+  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
+  run_on:
+  - amazon2023.0-arm64-small
+  expansions:
+    push_path: linux
+    push_bucket: downloads.mongodb.org
+    push_name: linux
+    push_arch: aarch64-amazon2023
+    compile_flags: --ssl MONGO_DISTMOD=amazon2023 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --use-diagnostic-latches=off --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
+    packager_distro: amazon2023
+    repo_edition: org
+    scons_cache_scope: shared
+    large_distro_name: amazon2023.0-arm64-large
+    compile_variant: amazon2023-arm64
+  tasks:
+  - name: compile_test_and_package_serial_TG
+    distros:
+    - amazon2023.0-arm64-large
+  - name: aggregation
+  - name: .auth !.audit !.multiversion
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js !.parallel
+  - name: .concurrency .common
+    distros:
+    - amazon2023.0-arm64-large
+  - name: concurrency_replication_causal_consistency_gen
+  - name: disk_wiredtiger
+  - name: .jscore .common
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: replica_sets_gen
+  - name: .replica_sets .common
+  - name: .sharding .txns
+  - name: .sharding .common !.csrs !.multiversion
+  - name: .ssl
+  - name: .stitch
+  - name: .publish
+  - name: generate_buildid_to_debug_symbols_mapping
+
+- name: enterprise-amazon2023-arm64
+  display_name: "Enterprise Amazon Linux 2023 arm64"
+  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
+  run_on:
+  - amazon2023.0-arm64-small
+  expansions:
+    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
+    push_path: linux
+    push_bucket: downloads.10gen.com
+    push_name: linux
+    push_arch: aarch64-enterprise-amazon2023
+    compile_flags: --ssl MONGO_DISTMOD=amazon2023 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --use-diagnostic-latches=off --enterprise-features="audit,encryptdb,fcbis,fips,fle,hot_backups,inmemory,kerberos,vector_search,ldap,live_import,mongohouse,queryable,sasl,search,serverless"
+    crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
+    # TODO BUILD-13887 should fix uses_pykmip incompatibility.
+    test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip,requires_v4_0,requires_external_data_source,requires_latch_analyzer
+    has_packages: true
+    multiversion_platform: amazon2023
+    multiversion_edition: enterprise
+    multiversion_architecture: aarch64
+    packager_script: packager_enterprise.py
+    packager_arch: aarch64
+    packager_distro: amazon2023
+    repo_edition: enterprise
+    scons_cache_scope: shared
+    compile_variant: enterprise-amazon2023-arm64
+  tasks:
+  - name: compile_test_and_package_serial_TG
+    distros:
+    - amazon2023.0-arm64-large
+  - name: .aggfuzzer !.multiversion
+  - name: audit
+  - name: auth_audit_gen
+  - name: auth_gen
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .encrypt !.sharding !.replica_sets !.aggregation !.jscore
+  - name: external_auth
+  - name: external_auth_aws
+  - name: .jscore .common !.decimal !.sharding
+  - name: jsCore_txns_large_txns_format
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: replica_sets_auth_gen
+  - name: replica_sets_jscore_passthrough
+  - name: .replica_sets .multi_oplog
+  - name: sasl
+  - name: search
+  - name: search_auth
+  - name: search_ssl
+  - name: sharding_auth_audit_gen
+  - name: sharding_auth_gen
+  - name: .publish
+  - name: generate_buildid_to_debug_symbols_mapping
+
 - name: debian10
  display_name: Debian 10
  cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
--- a/etc/generate_subtasks_config.yml
+++ b/etc/generate_subtasks_config.yml
@ -1,12 +1,16 @@
 build_variant_large_distro_exceptions:
  - amazon
  - amazon2
+  - amazon2023
+  - amazon2023-arm64
  - debian10
  - debian11
  - enterprise-amazon2
  - enterprise-amazon2-openssl111
  - enterprise-amazon2-arm64
  - enterprise-amazon2-arm64-openssl111
+  - enterprise-amazon2023
+  - enterprise-amazon2023-arm64
  - enterprise-debian10-64
  - enterprise-debian11-64
  - enterprise-linux-64-amazon-ami
--- a/etc/repo_config.yaml
+++ b/etc/repo_config.yaml
@ -128,6 +128,13 @@ repos:
    repos:
      - yum/amazon/2/mongodb-org

+  - name: amazon2023
+    type: rpm
+    edition: org
+    bucket: repo.mongodb.org
+    repos:
+      - yum/amazon/2023/mongodb-org
+
  - name: suse11
    type: rpm
    edition: org
@ -369,6 +376,13 @@ repos:
    repos:
      - yum/amazon/2/mongodb-enterprise

+  - name: amazon2023
+    type: rpm
+    edition: enterprise
+    bucket: repo.mongodb.com
+    repos:
+      - yum/amazon/2023/mongodb-enterprise
+
  - name: suse11
    type: rpm
    edition: enterprise
--- a/jstests/core/currentop_waiting_for_latch.js
+++ b/jstests/core/currentop_waiting_for_latch.js
@ -2,7 +2,8 @@
 * Tests that a backtrace will appear in the $currentOp output if the backtrace option is
 * set to true and there is a latch timeout.
 *
- * @tags: [assumes_read_concern_unchanged, assumes_read_preference_unchanged, no_selinux]
+ * @tags: [assumes_read_concern_unchanged, assumes_read_preference_unchanged, no_selinux,
+ * requires_latch_analyzer]
 */
 (function() {
 "use strict";
--- a/jstests/core/latch_analyzer.js
+++ b/jstests/core/latch_analyzer.js
@ -1,7 +1,7 @@
 /**
 * Verify that the LatchAnalyzer is working to expectations
 *
- * @tags: [multiversion_incompatible, no_selinux]
+ * @tags: [multiversion_incompatible, no_selinux, requires_latch_analyzer]
 */

 (function() {
--- a/jstests/noPassthrough/index_commit_currentop_slow.js
+++ b/jstests/noPassthrough/index_commit_currentop_slow.js
@ -43,7 +43,6 @@ const secondaryDB = secondary.getDB(testDB.getName());
 assert.soon(function() {
    const filter = {
        'command.commitIndexBuild': {$exists: true},
-        'waitingForLatch.captureName': 'AnonymousLockable',
        '$all': true,
    };
    const result = assert.commandWorked(secondaryDB.currentOp(filter));
--- a/jstests/noPassthrough/killOp_against_journal_flusher_thread.js
+++ b/jstests/noPassthrough/killOp_against_journal_flusher_thread.js
@ -1,7 +1,7 @@
 /**
 * Tests that killOp is ineffectual against the journal flusher thread.
 *
- * @tags: [requires_journaling]
+ * @tags: [requires_journaling,requires_latch_analyzer]
 */

 (function() {