SERVER-92375 Remove minor version from rhel8.x variant names (#24701)

GitOrigin-RevId: 8f3695c8936febc8dd1dfc617989d68bf2afdebc
This commit is contained in:
Zack Winter 2024-07-15 01:24:10 -07:00 committed by MongoDB Bot
parent f9fdf0abe2
commit 31f22e6b9b
30 changed files with 235 additions and 235 deletions

View File

@ -40,7 +40,7 @@ EXTERNAL_LOGGERS = {
"urllib3",
}
DEFAULT_VARIANT = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
DEFAULT_VARIANT = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
ENTERPRISE_MODULE_PATH = "src/mongo/db/modules/enterprise"
DEFAULT_REPO_LOCATIONS = ["."]
REPEAT_SUITES = 2

View File

@ -183,7 +183,7 @@ def main():
else:
if platform.machine() == 'x86_64':
variant = BuildVariant(
name="enterprise-rhel-80-64-bit-build-metrics",
name="enterprise-rhel-8-64-bit-build-metrics",
activate=True,
)
for link_model, tasks in tasks['linux_x86_64_tasks'].items():
@ -191,7 +191,7 @@ def main():
create_task_group(f'linux_X86_64_{link_model}', tasks), ['rhel80-xlarge'])
else:
variant = BuildVariant(
name="enterprise-rhel-80-aarch64-build-metrics",
name="enterprise-rhel-8-aarch64-build-metrics",
activate=True,
)
for link_model, tasks in tasks['linux_arm64_tasks'].items():

View File

@ -30,8 +30,8 @@ SYS_PLATFORM = sys.platform
# Apply factor for a task based on the build variant it is running on.
VARIANT_TASK_FACTOR_OVERRIDES = {
"enterprise-rhel-80-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}],
"enterprise-rhel-80-64-bit-inmem": [
"enterprise-rhel-8-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}],
"enterprise-rhel-8-64-bit-inmem": [
{"task": "secondary_reads_passthrough", "factor": 0.3},
{"task": "multi_stmt_txn_jscore_passthrough_with_migration", "factor": 0.3},
]

View File

@ -110,22 +110,22 @@ evergreen_buildvariants:
platform: rhel70
architecture: x86_64
- name: rhel80
- name: rhel8
edition: targeted
platform: rhel80
platform: rhel8
architecture: x86_64
- name: enterprise-rhel-80-64-bit
- name: enterprise-rhel-8-64-bit
edition: enterprise
platform: rhel80
platform: rhel8
architecture: x86_64
- name: rhel-82-arm64
- name: rhel-8-arm64
edition: targeted
platform: rhel82
architecture: arm64
- name: enterprise-rhel-82-arm64
- name: enterprise-rhel-8-arm64
edition: enterprise
platform: rhel82
architecture: arm64

View File

@ -86,7 +86,7 @@ def get_task_name_without_suffix(task_name, variant_name):
"""Return evergreen task name without suffix added to the generated task.
Remove evergreen variant name, numerical suffix and underscores between them from evergreen task name.
Example: "noPassthrough_0_enterprise-rhel-80-64-bit-dynamic-required" -> "noPassthrough"
Example: "noPassthrough_0_enterprise-rhel-8-64-bit-dynamic-required" -> "noPassthrough"
"""
task_name = task_name if task_name else ""
return re.sub(fr"(_[0-9]+)?(_{variant_name})?$", "", task_name)

View File

@ -1,7 +1,7 @@
"""
Get the display task name from the execution task and the variant.
Get an execution task name like this: multiversion_auth_0_enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required
Get an execution task name like this: multiversion_auth_0_enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required
Into a display task name like this: multiversion_auth
"""

View File

@ -28,7 +28,7 @@ class TestRemoveGenSuffix(unittest.TestCase):
class TestDetermineTaskBaseName(unittest.TestCase):
def test_task_name_with_build_variant_should_strip_bv_and_sub_task_index(self):
bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
task_name = f"auth_23_{bv}"
base_task_name = under_test.determine_task_base_name(task_name, bv)
@ -36,7 +36,7 @@ class TestDetermineTaskBaseName(unittest.TestCase):
self.assertEqual("auth", base_task_name)
def test_task_name_without_build_variant_should_strip_sub_task_index(self):
bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
task_name = "auth_314"
base_task_name = under_test.determine_task_base_name(task_name, bv)
@ -44,7 +44,7 @@ class TestDetermineTaskBaseName(unittest.TestCase):
self.assertEqual("auth", base_task_name)
def test_task_name_without_build_variant_or_subtask_index_should_self(self):
bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
task_name = "auth"
base_task_name = under_test.determine_task_base_name(task_name, bv)

View File

@ -11,7 +11,7 @@ variants, `burn_in_tags` runs them on the burn_in build variants that are genera
## How to use it
You can use `burn_in_tags` on evergreen by selecting the `burn_in_tags_gen` task when creating a patch.
The burn_in build variants, i.e., `enterprise-rhel-80-64-bit-inmem` and `enterprise-rhel-80-64-bit-multiversion`
The burn_in build variants, i.e., `enterprise-rhel-8-64-bit-inmem` and `enterprise-rhel-8-64-bit-multiversion`
will be generated, each of which will have a `burn_in_tests` task generated by the
[mongo-task-generator](https://github.com/mongodb/mongo-task-generator). `burn_in_tests` task, a
[generated task](task_generation.md), may have multiple sub-tasks which run the test suites only for the

View File

@ -397,8 +397,8 @@ buildvariants:
tasks:
- name: tla_plus
- name: &enterprise-rhel-80-64-bit-coverage enterprise-rhel-80-64-bit-coverage
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage"
- name: &enterprise-rhel-8-64-bit-coverage enterprise-rhel-8-64-bit-coverage
display_name: "~ Enterprise RHEL 8 DEBUG Code Coverage"
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -433,8 +433,8 @@ buildvariants:
use_scons_cache: false
gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov
num_scons_link_jobs_available: 0.99
compile_variant: *enterprise-rhel-80-64-bit-coverage
tasks: &enterprise-rhel-80-64-bit-coverage-tasks
compile_variant: *enterprise-rhel-8-64-bit-coverage
tasks: &enterprise-rhel-8-64-bit-coverage-tasks
- name: compile_test_and_package_parallel_core_stream_TG
distros:
- rhel80-large
@ -449,8 +449,8 @@ buildvariants:
- name: replica_sets_jscore_passthrough_gen
- name: generate_buildid_to_debug_symbols_mapping
- name: &enterprise-rhel-80-64-bit-coverage-clang enterprise-rhel-80-64-bit-coverage-clang
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage (clang)"
- name: &enterprise-rhel-8-64-bit-coverage-clang enterprise-rhel-8-64-bit-coverage-clang
display_name: "~ Enterprise RHEL 8 DEBUG Code Coverage (clang)"
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -488,9 +488,9 @@ buildvariants:
# the v3 gcov can read natively anyway, so we don't need it.
gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov
num_scons_link_jobs_available: 0.99
compile_variant: *enterprise-rhel-80-64-bit-coverage-clang
compile_variant: *enterprise-rhel-8-64-bit-coverage-clang
tasks:
*enterprise-rhel-80-64-bit-coverage-tasks
*enterprise-rhel-8-64-bit-coverage-tasks
- name: &stm-daily-cron stm-daily-cron
display_name: "* STM Daily Cron"
@ -918,15 +918,15 @@ buildvariants:
# Redhat buildvariants #
###########################################
- &enterprise-rhel-80-64-bit-dynamic-template
- &enterprise-rhel-8-64-bit-dynamic-template
<<: *linux_x86_dynamic_compile_variant_dependency
name: &enterprise-rhel-80-64-bit-dynamic enterprise-rhel-80-64-bit-dynamic
display_name: "* Shared Library Enterprise RHEL 8.0"
name: &enterprise-rhel-8-64-bit-dynamic enterprise-rhel-8-64-bit-dynamic
display_name: "* Shared Library Enterprise RHEL 8"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
- rhel80-small
# THIS WAS COPIED TO config_shard.yml - ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THAT FILE.
expansions: &enterprise-rhel-80-64-bit-dynamic-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-expansions
<<: *linux_x86_generic_expansions
scons_cache_scope: shared
scons_cache_mode: all
@ -1029,14 +1029,14 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- <<: *enterprise-rhel-80-64-bit-dynamic-template
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"
- <<: *enterprise-rhel-8-64-bit-dynamic-template
name: &enterprise-rhel-8-64-bit-dynamic-debug-mode enterprise-rhel-8-64-bit-dynamic-debug-mode
display_name: "Shared Library Enterprise RHEL 8 Debug Mode"
cron: "0 4 * * 0" # Run once a week on sunday at 4am
stepback: false
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-expansions
compile_variant: *enterprise-rhel-80-64-bit-dynamic-debug-mode
<<: *enterprise-rhel-8-64-bit-dynamic-expansions
compile_variant: *enterprise-rhel-8-64-bit-dynamic-debug-mode
compile_flags: >-
--ssl
MONGO_DISTMOD=rhel80
@ -1151,16 +1151,16 @@ buildvariants:
- name: vector_search_ssl
- name: generate_buildid_to_debug_symbols_mapping
- &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-template
- &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-template
<<: *linux_x86_dynamic_compile_variant_dependency
name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required
display_name: "! Shared Library Enterprise RHEL 8.0 (all feature flags)"
name: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required
display_name: "! Shared Library Enterprise RHEL 8 (all feature flags)"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
- rhel80-small
stepback: false
expansions: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions
<<: *enterprise-rhel-80-64-bit-dynamic-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-expansions
# 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: >-
@ -1289,16 +1289,16 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- &enterprise-rhel-80-64-bit-dynamic-classic-engine
- &enterprise-rhel-8-64-bit-dynamic-classic-engine
<<: *linux_x86_dynamic_compile_variant_dependency
name: enterprise-rhel-80-64-bit-dynamic-classic-engine
display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)"
name: enterprise-rhel-8-64-bit-dynamic-classic-engine
display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
stepback: false
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-expansions
jstestfuzz_num_generated_files: 40
jstestfuzz_concurrent_num_files: 10
target_resmoke_time: 10
@ -1396,8 +1396,8 @@ buildvariants:
- name: vector_search_ssl
- <<: *linux_x86_dynamic_compile_variant_dependency
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)"
name: &enterprise-rhel-8-64-bit-large-txns-format enterprise-rhel-8-64-bit-large-txns-format
display_name: "Enterprise RHEL 8 (large transactions format)"
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
run_on:
- rhel80-small
@ -1456,8 +1456,8 @@ buildvariants:
# currently only run on our daily builders.
- &linux-x86-multiversion-template
<<: *linux_x86_dynamic_compile_variant_dependency
name: &enterprise-rhel-80-64-bit-multiversion enterprise-rhel-80-64-bit-multiversion
display_name: "Enterprise RHEL 8.0 (implicit multiversion)"
name: &enterprise-rhel-8-64-bit-multiversion enterprise-rhel-8-64-bit-multiversion
display_name: "Enterprise RHEL 8 (implicit multiversion)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@ -1470,8 +1470,8 @@ buildvariants:
- name: .random_multiversion_ds
- <<: *linux-x86-multiversion-template
name: &enterprise-rhel-80-64-bit-multiversion-all-feature-flags enterprise-rhel-80-64-bit-multiversion-all-feature-flags
display_name: "Enterprise RHEL 8.0 (implicit multiversion & all feature flags)"
name: &enterprise-rhel-8-64-bit-multiversion-all-feature-flags enterprise-rhel-8-64-bit-multiversion-all-feature-flags
display_name: "Enterprise RHEL 8 (implicit multiversion & all feature flags)"
expansions:
<<: *linux-x86-multiversion-expansions-template
# No feature flag tests since they aren't compatible with the older binaries.
@ -1480,8 +1480,8 @@ buildvariants:
--excludeWithAnyTags=incompatible_with_shard_merge
- <<: *linux-x86-multiversion-template
name: &enterprise-rhel-80-64-bit-future-git-tag-multiversion enterprise-rhel-80-64-bit-future-git-tag-multiversion
display_name: "Enterprise RHEL 8.0 (future git tag multiversion)"
name: &enterprise-rhel-8-64-bit-future-git-tag-multiversion enterprise-rhel-8-64-bit-future-git-tag-multiversion
display_name: "Enterprise RHEL 8 (future git tag multiversion)"
expansions:
compile_flags: >-
-j$(grep -c ^processor /proc/cpuinfo)
@ -1502,7 +1502,7 @@ buildvariants:
bv_future_git_tag: r100.0.0-9999
test_flags: >-
--excludeWithAnyTags=future_git_tag_incompatible
compile_variant: *enterprise-rhel-80-64-bit-future-git-tag-multiversion
compile_variant: *enterprise-rhel-8-64-bit-future-git-tag-multiversion
depends_on: null
tasks:
- name: version_expansions_gen
@ -1514,8 +1514,8 @@ buildvariants:
- name: .multiversion !.future_git_tag_incompatible
- name: generate_buildid_to_debug_symbols_mapping
- name: &enterprise-rhel-80-64-bit-suggested enterprise-rhel-80-64-bit-suggested
display_name: "* Enterprise RHEL 8.0"
- name: &enterprise-rhel-8-64-bit-suggested enterprise-rhel-8-64-bit-suggested
display_name: "* Enterprise RHEL 8"
cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
- rhel80-build
@ -1539,7 +1539,7 @@ buildvariants:
repo_edition: enterprise
scons_cache_scope: shared
large_distro_name: rhel80-large
compile_variant: *enterprise-rhel-80-64-bit-suggested
compile_variant: *enterprise-rhel-8-64-bit-suggested
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:
@ -1578,8 +1578,8 @@ buildvariants:
- name: selinux_rhel8_enterprise
- name: generate_buildid_to_debug_symbols_mapping
- name: &enterprise-rhel-80-64-bit-build-metrics enterprise-rhel-80-64-bit-build-metrics
display_name: "~ Build Metrics Enterprise RHEL 8.0 "
- name: &enterprise-rhel-8-64-bit-build-metrics enterprise-rhel-8-64-bit-build-metrics
display_name: "~ Build Metrics Enterprise RHEL 8 "
cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter
stepback: false
run_on:
@ -1595,7 +1595,7 @@ buildvariants:
tasks:
- name: build_metrics_gen_TG
- name: &enterprise-rhel-80-aarch64-build-metrics enterprise-rhel-80-aarch64-build-metrics
- name: &enterprise-rhel-8-aarch64-build-metrics enterprise-rhel-8-aarch64-build-metrics
display_name: "~ Build Metrics Enterprise AL22 ARM"
cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter
stepback: false
@ -1710,8 +1710,8 @@ buildvariants:
# storage engine buildvariants #
################################
- name: &enterprise-rhel-80-benchmarks enterprise-rhel-80-benchmarks
display_name: "* Enterprise RHEL 8.0 (Benchmarks)"
- name: &enterprise-rhel-8-benchmarks enterprise-rhel-8-benchmarks
display_name: "* Enterprise RHEL 8 (Benchmarks)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-medium
@ -1722,7 +1722,7 @@ buildvariants:
-j$(grep -c ^processor /proc/cpuinfo)
--variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
scons_cache_scope: shared
compile_variant: *enterprise-rhel-80-benchmarks
compile_variant: *enterprise-rhel-8-benchmarks
tasks:
- name: compile_upload_benchmarks_TG
- name: .benchmarks
@ -1865,8 +1865,8 @@ buildvariants:
# Experimental buildvariants #
###########################################
- name: &rhel80-debug-asan-classic-engine rhel80-debug-asan-classic-engine
display_name: "* ASAN Enterprise RHEL 8.0 DEBUG (Classic Engine)"
- name: &rhel8-debug-asan-classic-engine rhel8-debug-asan-classic-engine
display_name: "* ASAN Enterprise RHEL 8 DEBUG (Classic Engine)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -1886,7 +1886,7 @@ buildvariants:
--ssl
--ocsp-stapling=off
-j$(grep -c ^processor /proc/cpuinfo)
compile_variant: *rhel80-debug-asan-classic-engine
compile_variant: *rhel8-debug-asan-classic-engine
test_flags: >-
--mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
--excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling,requires_increased_memlock_limits,requires_latch_analyzer
@ -1947,9 +1947,9 @@ buildvariants:
- name: server_selection_json_test_TG
- name: generate_buildid_to_debug_symbols_mapping
- &rhel80-debug-ubsan-all-feature-flags-template
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)"
- &rhel8-debug-ubsan-all-feature-flags-template
name: &rhel8-debug-ubsan-all-feature-flags rhel8-debug-ubsan-all-feature-flags
display_name: "* Shared Library UBSAN Enterprise RHEL 8 DEBUG (all feature flags)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -1969,7 +1969,7 @@ buildvariants:
--ssl
--ocsp-stapling=off
-j$(grep -c ^processor /proc/cpuinfo)
compile_variant: *rhel80-debug-ubsan-all-feature-flags
compile_variant: *rhel8-debug-ubsan-all-feature-flags
# 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: >-
@ -1988,8 +1988,8 @@ buildvariants:
- name: disk_wiredtiger
- name: generate_buildid_to_debug_symbols_mapping
- name: &rhel80-debug-ubsan-classic-engine rhel80-debug-ubsan-classic-engine
display_name: "* UBSAN Enterprise RHEL 8.0 DEBUG (Classic Engine)"
- name: &rhel8-debug-ubsan-classic-engine rhel8-debug-ubsan-classic-engine
display_name: "* UBSAN Enterprise RHEL 8 DEBUG (Classic Engine)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -2000,7 +2000,7 @@ buildvariants:
archive-mongocryptd-debug
lang_environment: LANG=C
san_options: *ubsan_options
compile_variant: *rhel80-debug-ubsan-classic-engine
compile_variant: *rhel8-debug-ubsan-classic-engine
compile_flags: >-
--variables-files=etc/scons/mongodbtoolchain_stable_clang.vars
--dbg=on
@ -2062,10 +2062,10 @@ buildvariants:
- name: server_selection_json_test_TG
- name: generate_buildid_to_debug_symbols_mapping
- &rhel80-debug-aubsan-lite-template
- &rhel8-debug-aubsan-lite-template
<<: *linux_debug_aubsan_compile_variant_dependency
name: &rhel80-debug-aubsan-lite rhel80-debug-aubsan-lite
display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG"
name: &rhel8-debug-aubsan-lite rhel8-debug-aubsan-lite
display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
- rhel80-build
@ -2087,9 +2087,9 @@ buildvariants:
- name: jsCore
- name: jsCore_txns
- <<: *rhel80-debug-aubsan-lite-template
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)"
- <<: *rhel8-debug-aubsan-lite-template
name: &rhel8-debug-aubsan-lite-all-feature-flags-required rhel8-debug-aubsan-lite-all-feature-flags-required
display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG (all feature flags)"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
expansions:
<<: *aubsan-lite-required-expansions
@ -2105,9 +2105,9 @@ buildvariants:
- name: jsCore_column_store_indexes
- name: jsCore_wildcard_indexes
- <<: *rhel80-debug-aubsan-lite-template
name: &rhel80-debug-aubsan-all-feature-flags rhel80-debug-aubsan-all-feature-flags
display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG (all feature flags)"
- <<: *rhel8-debug-aubsan-lite-template
name: &rhel8-debug-aubsan-all-feature-flags rhel8-debug-aubsan-all-feature-flags
display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG (all feature flags)"
cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter
expansions:
<<: *aubsan-lite-required-expansions
@ -2176,20 +2176,20 @@ buildvariants:
- name: .updatefuzzer
- name: .watchdog
- &enterprise-rhel80-debug-tsan-template
name: &enterprise-rhel80-debug-tsan enterprise-rhel80-debug-tsan
display_name: "* TSAN Enterprise RHEL 8.0 DEBUG"
- &enterprise-rhel8-debug-tsan-template
name: &enterprise-rhel8-debug-tsan enterprise-rhel8-debug-tsan
display_name: "* TSAN Enterprise RHEL 8 DEBUG"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-large
stepback: false
expansions: &enterprise-rhel80-debug-tsan-expansions-template
expansions: &enterprise-rhel8-debug-tsan-expansions-template
additional_package_targets: >-
archive-mongocryptd
archive-mongocryptd-debug
lang_environment: LANG=C
toolchain_version: stable
compile_variant: *enterprise-rhel80-debug-tsan
compile_variant: *enterprise-rhel8-debug-tsan
# If you add anything to san_options, make sure the appropriate
# changes are also made to SConstruct.
#
@ -2235,7 +2235,7 @@ buildvariants:
# variant: generate-tasks-for-version
# omit_generated_tasks: true
# - name: archive_dist_test_debug
# variant: *enterprise-rhel80-debug-tsan
# variant: *enterprise-rhel8-debug-tsan
- name: buildscripts_test
# - name: resmoke_end2end_tests # Not passing
# - name: unittest_shell_hang_analyzer_gen # Not passing
@ -2331,17 +2331,17 @@ buildvariants:
- name: vector_search_ssl
- name: generate_buildid_to_debug_symbols_mapping
- &enterprise-rhel80-debug-complete-tsan-template
name: &enterprise-rhel80-debug-complete-tsan enterprise-rhel80-debug-complete-tsan
display_name: "~ TSAN Enterprise RHEL 8.0 COMPLETE DEBUG"
- &enterprise-rhel8-debug-complete-tsan-template
name: &enterprise-rhel8-debug-complete-tsan enterprise-rhel8-debug-complete-tsan
display_name: "~ TSAN Enterprise RHEL 8 COMPLETE DEBUG"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
activate: false
run_on:
- rhel80-large
stepback: false
expansions:
<<: *enterprise-rhel80-debug-tsan-expansions-template
compile_variant: *enterprise-rhel80-debug-complete-tsan
<<: *enterprise-rhel8-debug-tsan-expansions-template
compile_variant: *enterprise-rhel8-debug-complete-tsan
tasks:
- name: compile_test_and_package_serial_TG
- name: compile_test_and_package_parallel_unittest_stream_TG
@ -2406,8 +2406,8 @@ buildvariants:
- rhel80-xlarge
- name: generate_buildid_to_debug_symbols_mapping
- name: &enterprise-rhel80-unoptimized-64-bit enterprise-rhel80-unoptimized-64-bit
display_name: "~ Enterprise RHEL 8.0 DEBUG (Unoptimized)"
- name: &enterprise-rhel8-unoptimized-64-bit enterprise-rhel8-unoptimized-64-bit
display_name: "~ Enterprise RHEL 8 DEBUG (Unoptimized)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
expansions:
compile_flags: >-
@ -2421,7 +2421,7 @@ buildvariants:
scons_cache_mode: all
scons_cache_scope: shared
num_scons_link_jobs_available: 0.99
compile_variant: *enterprise-rhel80-unoptimized-64-bit
compile_variant: *enterprise-rhel8-unoptimized-64-bit
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2436,8 +2436,8 @@ buildvariants:
distros:
- rhel80-build
- name: &enterprise-rhel80-fixed-service-executor-64-bit enterprise-rhel80-fixed-service-executor-64-bit
display_name: "~ Enterprise RHEL 8.0 (with FixedServiceExecutor)"
- name: &enterprise-rhel8-fixed-service-executor-64-bit enterprise-rhel8-fixed-service-executor-64-bit
display_name: "~ Enterprise RHEL 8 (with FixedServiceExecutor)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@ -2452,7 +2452,7 @@ buildvariants:
--mongosSetParameters="{initialServiceExecutorUseDedicatedThread: false}"
--mongodSetParameters="{initialServiceExecutorUseDedicatedThread: false}"
large_distro_name: rhel80-build
compile_variant: *enterprise-rhel80-fixed-service-executor-64-bit
compile_variant: *enterprise-rhel8-fixed-service-executor-64-bit
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2479,8 +2479,8 @@ buildvariants:
- name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
- name: generate_buildid_to_debug_symbols_mapping
- 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)"
- name: &enterprise-rhel8-sdam-replica-set-monitor-64-bit enterprise-rhel8-sdam-replica-set-monitor-64-bit
display_name: "~ Enterprise RHEL 8 (with SdamReplicaSetMonitor)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@ -2496,7 +2496,7 @@ buildvariants:
--mongodSetParameters="{replicaSetMonitorProtocol: sdam}"
--excludeWithAnyTags=requires_streamable_rsm
large_distro_name: rhel80-build
compile_variant: *enterprise-rhel80-sdam-replica-set-monitor-64-bit
compile_variant: *enterprise-rhel8-sdam-replica-set-monitor-64-bit
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2521,8 +2521,8 @@ buildvariants:
- name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
- name: generate_buildid_to_debug_symbols_mapping
- 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\"})"
- name: &enterprise-rhel8-sharding-task-executor-pool-rsm-matchPrimary-64-bit enterprise-rhel8-sharding-task-executor-pool-rsm-matchPrimary-64-bit
display_name: "~ Enterprise RHEL 8 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"})"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@ -2537,7 +2537,7 @@ buildvariants:
--mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\""
--excludeWithAnyTags=sets_replica_set_matching_strategy
large_distro_name: rhel80-build
compile_variant: *enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit
compile_variant: *enterprise-rhel8-sharding-task-executor-pool-rsm-matchPrimary-64-bit
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2562,8 +2562,8 @@ buildvariants:
- name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
- name: generate_buildid_to_debug_symbols_mapping
- name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit
display_name: "~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"})"
- name: &enterprise-rhel8-sharding-task-executor-pool-rsm-matchBusiest-64-bit enterprise-rhel8-sharding-task-executor-pool-rsm-matchBusiest-64-bit
display_name: "~ Enterprise RHEL 8 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"})"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@ -2583,7 +2583,7 @@ buildvariants:
--mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\""
--excludeWithAnyTags=sets_replica_set_matching_strategy
large_distro_name: rhel80-build
compile_variant: *enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit
compile_variant: *enterprise-rhel8-sharding-task-executor-pool-rsm-matchBusiest-64-bit
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2608,8 +2608,8 @@ buildvariants:
- name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
- name: generate_buildid_to_debug_symbols_mapping
- name: &enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit
display_name: "~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"})"
- name: &enterprise-rhel8-sharding-task-executor-pool-rsm-disabled-64-bit enterprise-rhel8-sharding-task-executor-pool-rsm-disabled-64-bit
display_name: "~ Enterprise RHEL 8 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"})"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@ -2629,7 +2629,7 @@ buildvariants:
--mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\""
--excludeWithAnyTags=sets_replica_set_matching_strategy
large_distro_name: rhel80-build
compile_variant: *enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit
compile_variant: *enterprise-rhel8-sharding-task-executor-pool-rsm-disabled-64-bit
tasks:
- name: compile_test_and_package_parallel_core_stream_TG
distros:
@ -2654,8 +2654,8 @@ buildvariants:
- name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
- name: generate_buildid_to_debug_symbols_mapping
- name: &enterprise-rhel80-join-ingress-sessions-on-shutdown enterprise-rhel80-join-ingress-sessions-on-shutdown
display_name: "~ Enterprise RHEL 8.0 (with {joinIngressSessionsOnShutdown: \"true\"})"
- name: &enterprise-rhel8-join-ingress-sessions-on-shutdown enterprise-rhel8-join-ingress-sessions-on-shutdown
display_name: "~ Enterprise RHEL 8 (with {joinIngressSessionsOnShutdown: \"true\"})"
activate: false
run_on:
- rhel80-small
@ -2673,7 +2673,7 @@ buildvariants:
--mongosSetParameters="joinIngressSessionsOnShutdown: \"true\""
--mongodSetParameters="joinIngressSessionsOnShutdown: \"true\""
large_distro_name: rhel80-build
compile_variant: *enterprise-rhel80-join-ingress-sessions-on-shutdown
compile_variant: *enterprise-rhel8-join-ingress-sessions-on-shutdown
tasks:
- name: compile_test_and_package_serial_TG
distros:
@ -2726,7 +2726,7 @@ buildvariants:
tasks:
- name: win_shared_scons_cache_pruning
- <<: *enterprise-rhel-80-64-bit-dynamic-template
- <<: *enterprise-rhel-8-64-bit-dynamic-template
name: &commit-queue commit-queue
display_name: "~ Commit Queue"
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@ -2807,14 +2807,14 @@ buildvariants:
# coverage for CQF without disrupting coverage for other feature flags (in particular, SBE).
# TODO SERVER-71163: Remove this variant once the CQF feature flag is not always-disabled.
- <<: *linux_x86_dynamic_compile_variant_dependency
name: enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-and-cqf-enabled-patch-only
display_name: "Shared Library Enterprise RHEL 8.0 Query Patch Only (all feature flags and CQF enabled)"
name: enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-and-cqf-enabled-patch-only
display_name: "Shared Library Enterprise RHEL 8 Query Patch Only (all feature flags and CQF enabled)"
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:
- rhel80-small
stepback: false
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-expansions
test_flags: >-
--excludeWithAnyTags=cqf_incompatible
--excludeWithAnyTags=resource_intensive
@ -2835,12 +2835,12 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- <<: *enterprise-rhel-80-64-bit-dynamic-classic-engine
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)"
- <<: *enterprise-rhel-8-64-bit-dynamic-classic-engine
name: &enterprise-rhel-8-64-bit-dynamic-classic-engine-query-patch-only enterprise-rhel-8-64-bit-dynamic-classic-engine-query-patch-only
display_name: "~ Shared Library Enterprise RHEL 8 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.
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-expansions
jstestfuzz_num_generated_files: 20
jstestfuzz_concurrent_num_files: 5
target_resmoke_time: 30
@ -2849,12 +2849,12 @@ buildvariants:
--mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
--excludeWithAnyTags=resource_intensive
- <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-template
name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-query-patch-only enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-query-patch-only
display_name: "~ Shared Library Enterprise RHEL 8.0 Query Patch Only (all feature flags)"
- <<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-template
name: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-query-patch-only enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-query-patch-only
display_name: "~ Shared Library Enterprise RHEL 8 Query Patch Only (all feature flags)"
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.
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-expansions
jstestfuzz_num_generated_files: 20
jstestfuzz_concurrent_num_files: 5
target_resmoke_time: 30
@ -2864,12 +2864,12 @@ buildvariants:
--excludeWithAnyTags=resource_intensive
--excludeWithAnyTags=incompatible_with_shard_merge
- <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-template
name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-security-patch-only enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-security-patch-only
display_name: "~ Shared Library Enterprise RHEL 8.0 Security Patch Only (all feature flags)"
- <<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-template
name: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-security-patch-only enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-security-patch-only
display_name: "~ Shared Library Enterprise RHEL 8 Security Patch Only (all feature flags)"
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.
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-expansions
target_resmoke_time: 15
max_sub_suites: 15
tasks:

View File

@ -200,14 +200,14 @@ buildvariants:
- name: sharding_auth_audit_gen
- name: sharding_max_mirroring_opportunistic_secondary_targeting_ese_gen
- &enterprise-rhel-80-64-bit-dynamic-template
- &enterprise-rhel-8-64-bit-dynamic-template
<<: *linux_x86_dynamic_compile_variant_dependency
name: &enterprise-rhel-80-64-bit-dynamic-required enterprise-rhel-80-64-bit-dynamic-required
display_name: "! Shared Library Enterprise RHEL 8.0"
name: &enterprise-rhel-8-64-bit-dynamic-required enterprise-rhel-8-64-bit-dynamic-required
display_name: "! Shared Library Enterprise RHEL 8"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-expansions
<<: *linux_x86_generic_expansions
scons_cache_scope: shared
scons_cache_mode: all
@ -220,8 +220,8 @@ buildvariants:
exec_timeout_factor: 1.5
large_distro_name: rhel80-medium
burn_in_tag_buildvariants: >-
enterprise-rhel-80-64-bit-inmem
enterprise-rhel-80-64-bit-multiversion
enterprise-rhel-8-64-bit-inmem
enterprise-rhel-8-64-bit-multiversion
burn_in_tag_compile_task_dependency: archive_dist_test_debug
test_flags: --excludeWithAnyTags=requires_latch_analyzer
depends_on:
@ -323,10 +323,10 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- &rhel80-debug-aubsan-lite-template
- &rhel8-debug-aubsan-lite-template
<<: *linux_debug_aubsan_compile_variant_dependency
name: &rhel80-debug-aubsan-lite-required rhel80-debug-aubsan-lite-required
display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG"
name: &rhel8-debug-aubsan-lite-required rhel8-debug-aubsan-lite-required
display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8 DEBUG"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
- rhel80-build
@ -358,7 +358,7 @@ buildvariants:
burn_in_tag_exclude_build_variants: >-
macos-debug-suggested
burn_in_tag_include_build_variants: >-
enterprise-rhel-80-64-bit-inmem
enterprise-rhel-8-64-bit-inmem
burn_in_tag_compile_task_dependency: archive_dist_test_debug
compile_variant: *linux_x86_dynamic_compile_variant_name
depends_on:
@ -377,7 +377,7 @@ buildvariants:
tasks:
- name: burn_in_tags_gen
- <<: *enterprise-rhel-80-64-bit-dynamic-template
- <<: *enterprise-rhel-8-64-bit-dynamic-template
name: &commit-queue commit-queue
display_name: "~ Commit Queue"
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter

View File

@ -19,15 +19,15 @@ overrides:
- task: replica_sets_jscore_passthrough
exec_timeout: 150 # 2.5 hours
enterprise-rhel-80-64-bit-coverage:
enterprise-rhel-8-64-bit-coverage:
- task: replica_sets_jscore_passthrough
exec_timeout: 150 # 2.5 hours.
enterprise-rhel80-debug-complete-tsan:
enterprise-rhel8-debug-complete-tsan:
- task: aggregation_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours
enterprise-rhel80-debug-tsan:
enterprise-rhel8-debug-tsan:
- task: aggregation_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours
@ -39,23 +39,23 @@ overrides:
- task: replica_sets_jscore_passthrough
exec_timeout: 150 # 2.5 hours
rhel80-asan:
rhel8-asan:
- task: aggregation_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours
rhel80-debug-ubsan:
rhel8-debug-ubsan:
- task: update_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours
rhel80-debug-suggested:
rhel8-debug-suggested:
- task: replica_sets_jscore_passthrough
exec_timeout: 180 # 3 hours.
rhel80-debug-ubsan-classic-engine:
rhel8-debug-ubsan-classic-engine:
- task: update_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours
rhel80-debug-aubsan-all-feature-flags:
rhel8-debug-aubsan-all-feature-flags:
- task: update_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours

View File

@ -248,10 +248,10 @@ variables:
- enterprise-macos-arm64
- enterprise-rhel-70-64-bit
- enterprise-rhel-81-ppc64le
- enterprise-rhel-80-64-bit
- enterprise-rhel-80-64-bit-coverage
- enterprise-rhel-80-64-bit-suggested
- enterprise-rhel-82-arm64
- enterprise-rhel-8-64-bit
- enterprise-rhel-8-64-bit-coverage
- enterprise-rhel-8-64-bit-suggested
- enterprise-rhel-8-arm64
- enterprise-rhel-83-s390x
- enterprise-rhel-90-64-bit
- enterprise-rhel-90-arm64
@ -272,10 +272,10 @@ variables:
- mh_variants: &mh_variants
- enterprise-macos
- enterprise-macos-arm64
- enterprise-rhel-80-64-bit
- enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required
- enterprise-rhel-8-64-bit
- enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required
- enterprise-rhel-70-64-bit
- enterprise-rhel-82-arm64
- enterprise-rhel-8-arm64
- enterprise-rhel-90-64-bit
- enterprise-rhel-90-arm64
- enterprise-amazon2-arm64
@ -309,13 +309,13 @@ variables:
- enterprise-rhel-70-64-bit
- enterprise-rhel-81-ppc64le
- ubi8
- rhel80
- rhel-82-arm64
- rhel8
- rhel-8-arm64
- rhel90
- rhel90-arm64
- enterprise-rhel-80-64-bit
- enterprise-rhel-80-64-bit-suggested # For testing selinux.
- enterprise-rhel-82-arm64
- enterprise-rhel-8-64-bit
- enterprise-rhel-8-64-bit-suggested # For testing selinux.
- enterprise-rhel-8-arm64
- enterprise-rhel-83-s390x
- enterprise-rhel-90-64-bit
- enterprise-rhel-90-arm64

View File

@ -19,7 +19,7 @@ variables:
num_scons_link_jobs_available: 0.99
compile_variant: *linux_x86_dynamic_compile_variant_name
- &enterprise-rhel-80-64-bit-dynamic-expansions
- &enterprise-rhel-8-64-bit-dynamic-expansions
<<: *linux_x86_generic_expansions
scons_cache_scope: shared
scons_cache_mode: all
@ -44,16 +44,16 @@ variables:
- ubsan_options: &ubsan_options UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v4/bin/llvm-symbolizer"
buildvariants:
- &enterprise-rhel-80-64-bit-dynamic-classic-engine
- &enterprise-rhel-8-64-bit-dynamic-classic-engine
<<: *linux_x86_dynamic_compile_variant_dependency
name: enterprise-rhel-80-64-bit-dynamic-classic-engine
display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)"
name: enterprise-rhel-8-64-bit-dynamic-classic-engine
display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)"
cron: "0 0 * * 0" # once a week (Sunday midnight UTC)
run_on:
- rhel80-small
stepback: false
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-expansions
jstestfuzz_num_generated_files: 40
jstestfuzz_concurrent_num_files: 10
target_resmoke_time: 10
@ -151,8 +151,8 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- name: &rhel80-debug-asan-classic-engine rhel80-debug-asan-classic-engine
display_name: "* ASAN Enterprise RHEL 8.0 DEBUG (Classic Engine)"
- name: &rhel8-debug-asan-classic-engine rhel8-debug-asan-classic-engine
display_name: "* ASAN Enterprise RHEL 8 DEBUG (Classic Engine)"
cron: "0 0 * * 2" # once a week (Tuesday midnight UTC)
run_on:
- rhel80-build
@ -172,7 +172,7 @@ buildvariants:
--ssl
--ocsp-stapling=off
-j$(grep -c ^processor /proc/cpuinfo)
compile_variant: *rhel80-debug-asan-classic-engine
compile_variant: *rhel8-debug-asan-classic-engine
test_flags: >-
--mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
--excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling,requires_increased_memlock_limits,requires_latch_analyzer
@ -233,8 +233,8 @@ buildvariants:
- name: server_selection_json_test_TG
- name: generate_buildid_to_debug_symbols_mapping
- name: &rhel80-debug-ubsan-classic-engine rhel80-debug-ubsan-classic-engine
display_name: "* UBSAN Enterprise RHEL 8.0 DEBUG (Classic Engine)"
- name: &rhel8-debug-ubsan-classic-engine rhel8-debug-ubsan-classic-engine
display_name: "* UBSAN Enterprise RHEL 8 DEBUG (Classic Engine)"
cron: "0 0 * * 4" # once a week (Thursday midnight UTC)
run_on:
- rhel80-build
@ -245,7 +245,7 @@ buildvariants:
archive-mongocryptd-debug
lang_environment: LANG=C
san_options: *ubsan_options
compile_variant: *rhel80-debug-ubsan-classic-engine
compile_variant: *rhel8-debug-ubsan-classic-engine
compile_flags: >-
--variables-files=etc/scons/mongodbtoolchain_stable_clang.vars
--dbg=on

View File

@ -23,7 +23,7 @@ variables:
compile_variant: *linux_x86_dynamic_compile_variant_name
# THIS WAS COPIED FROM EVERGREEN.YML - ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THAT FILE.
- &enterprise-rhel-80-64-bit-dynamic-expansions
- &enterprise-rhel-8-64-bit-dynamic-expansions
<<: *linux_x86_generic_expansions
scons_cache_scope: shared
scons_cache_mode: all
@ -37,16 +37,16 @@ variables:
large_distro_name: rhel80-medium
buildvariants:
- &enterprise-rhel-80-64-bit-dynamic-config-shard
- &enterprise-rhel-8-64-bit-dynamic-config-shard
<<: *linux_x86_dynamic_compile_variant_dependency
name: enterprise-rhel-80-64-bit-dynamic-config-shard
display_name: "* Shared Library Enterprise RHEL 8.0 (Config Shard)"
name: enterprise-rhel-8-64-bit-dynamic-config-shard
display_name: "* Shared Library Enterprise RHEL 8 (Config Shard)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
stepback: false
expansions: &enterprise-rhel-80-64-bit-dynamic-config-shard-expansions
<<: *enterprise-rhel-80-64-bit-dynamic-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-config-shard-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-expansions
test_flags: >-
--configShard=any
--excludeWithAnyTags=config_shard_incompatible,multiversion_incompatible

View File

@ -1,8 +1,8 @@
# InMemory build variants that need to be run on LTS but not Rapid releases.
buildvariants:
- name: enterprise-rhel-80-64-bit-inmem
display_name: Enterprise RHEL 8.0 (inMemory)
- name: enterprise-rhel-8-64-bit-inmem
display_name: Enterprise RHEL 8 (inMemory)
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@ -22,7 +22,7 @@ buildvariants:
multiversion_edition: enterprise
scons_cache_scope: shared
large_distro_name: rhel80-large
compile_variant: enterprise-rhel-80-64-bit-inmem
compile_variant: enterprise-rhel-8-64-bit-inmem
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:

View File

@ -1106,8 +1106,8 @@ buildvariants:
distros:
- rhel80-large
- name: rhel80
display_name: RHEL 8.0
- name: rhel8
display_name: RHEL 8
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -1131,7 +1131,7 @@ buildvariants:
repo_edition: org
scons_cache_scope: shared
large_distro_name: rhel80-build
compile_variant: rhel80
compile_variant: rhel8
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:
@ -1164,12 +1164,12 @@ buildvariants:
- name: .publish
- name: generate_buildid_to_debug_symbols_mapping
- name: enterprise-rhel-80-64-bit
display_name: "Enterprise RHEL 8.0"
- name: enterprise-rhel-8-64-bit
display_name: "Enterprise RHEL 8"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-expansions
expansions: &enterprise-rhel-8-64-bit-expansions
additional_package_targets: >-
archive-mongocryptd
archive-mongocryptd-debug
@ -1200,7 +1200,7 @@ buildvariants:
target_resmoke_time: 10
max_sub_suites: 3
large_distro_name: rhel80-medium
compile_variant: enterprise-rhel-80-64-bit
compile_variant: enterprise-rhel-8-64-bit
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:
@ -1291,8 +1291,8 @@ buildvariants:
- name: .publish
- name: generate_buildid_to_debug_symbols_mapping
- name: rhel-82-arm64
display_name: RHEL 8.2 arm64
- name: rhel-8-arm64
display_name: RHEL 8 arm64
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel82-arm64-small
@ -1314,7 +1314,7 @@ buildvariants:
repo_edition: org
scons_cache_scope: shared
large_distro_name: rhel82-arm64-large
compile_variant: rhel-82-arm64
compile_variant: rhel-8-arm64
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:
@ -1345,8 +1345,8 @@ buildvariants:
- name: .publish
- name: generate_buildid_to_debug_symbols_mapping
- name: enterprise-rhel-82-arm64
display_name: "Enterprise RHEL 8.2 arm64"
- name: enterprise-rhel-8-arm64
display_name: "Enterprise RHEL 8 arm64"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel82-arm64-small
@ -1375,7 +1375,7 @@ buildvariants:
packager_distro: rhel82
repo_edition: enterprise
scons_cache_scope: shared
compile_variant: enterprise-rhel-82-arm64
compile_variant: enterprise-rhel-8-arm64
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:
@ -2702,8 +2702,8 @@ buildvariants:
- name: .crypt
- name: .publish_crypt
- name: enterprise-rhel-82-arm64-grpc
display_name: "Enterprise RHEL 8.2 arm64 GRPC"
- name: enterprise-rhel-8-arm64-grpc
display_name: "Enterprise RHEL 8 arm64 GRPC"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel82-arm64-large
@ -2718,7 +2718,7 @@ buildvariants:
--variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
--link-model=dynamic
ENABLE_GRPC_BUILD=1
compile_variant: enterprise-rhel-82-arm64-grpc
compile_variant: enterprise-rhel-8-arm64-grpc
scons_cache_scope: shared
tasks:
- name: compile_test_and_package_parallel_unittest_stream_TG

View File

@ -102,8 +102,8 @@ buildvariants:
distros:
- ubuntu1804-xlarge
- name: enterprise-rhel-80-64-bit-dynamic-ninja
display_name: "Ninja Build: Enterprise RHEL 8.0"
- name: enterprise-rhel-8-64-bit-dynamic-ninja
display_name: "Ninja Build: Enterprise RHEL 8"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small

View File

@ -15,8 +15,8 @@ variables:
buildvariants:
- name: rhel80-asan
display_name: ~ ASAN RHEL 8.0
- name: rhel8-asan
display_name: ~ ASAN RHEL 8
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -40,7 +40,7 @@ buildvariants:
scons_cache_scope: shared
test_flags: --excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling --enableEnterpriseTests=off
separate_debug: off
compile_variant: rhel80-asan
compile_variant: rhel8-asan
tasks:
- name: compile_test_and_package_serial_TG
- name: compile_test_and_package_parallel_unittest_stream_TG
@ -48,8 +48,8 @@ buildvariants:
- name: .jstestfuzz !.initsync
- name: generate_buildid_to_debug_symbols_mapping
- name: rhel80-debug-asan
display_name: ~ ASAN Enterprise RHEL 8.0 DEBUG
- name: rhel8-debug-asan
display_name: ~ ASAN Enterprise RHEL 8 DEBUG
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -78,7 +78,7 @@ buildvariants:
exec_timeout_secs: 14400 # 3 hour timeout
separate_debug: off
large_distro_name: rhel80-build
compile_variant: rhel80-debug-asan
compile_variant: rhel8-debug-asan
tasks:
- name: compile_test_benchmark_and_package_serial_TG
- name: compile_test_and_package_parallel_unittest_stream_TG
@ -134,8 +134,8 @@ buildvariants:
- name: server_selection_json_test_TG
- name: generate_buildid_to_debug_symbols_mapping
- name: rhel80-debug-ubsan
display_name: ~ UBSAN Enterprise RHEL 8.0 DEBUG
- name: rhel8-debug-ubsan
display_name: ~ UBSAN Enterprise RHEL 8 DEBUG
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -161,7 +161,7 @@ buildvariants:
scons_cache_scope: shared
separate_debug: off
large_distro_name: rhel80-build
compile_variant: rhel80-debug-ubsan
compile_variant: rhel8-debug-ubsan
tasks:
- name: compile_test_benchmark_and_package_serial_TG
- name: compile_test_and_package_parallel_unittest_stream_TG
@ -212,9 +212,9 @@ buildvariants:
- name: server_selection_json_test_TG
- name: generate_buildid_to_debug_symbols_mapping
- &rhel80-debug-aubsan-lite_fuzzer-template
name: &rhel80-debug-aubsan-lite_fuzzer rhel80-debug-aubsan-lite_fuzzer
display_name: "{A,UB}SAN Enterprise RHEL 8.0 FUZZER"
- &rhel8-debug-aubsan-lite_fuzzer-template
name: &rhel8-debug-aubsan-lite_fuzzer rhel8-debug-aubsan-lite_fuzzer
display_name: "{A,UB}SAN Enterprise RHEL 8 FUZZER"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@ -244,7 +244,7 @@ buildvariants:
hang_analyzer_dump_core: false
scons_cache_scope: shared
separate_debug: off
compile_variant: *rhel80-debug-aubsan-lite_fuzzer
compile_variant: *rhel8-debug-aubsan-lite_fuzzer
display_tasks:
- name: libfuzzertests!
execution_tasks:

View File

@ -23,10 +23,10 @@ build_variant_large_distro_exceptions:
- enterprise-rhel-70-64-bit
- enterprise-rhel-71-ppc64le
- enterprise-rhel-71-ppc64le-inmem
- enterprise-rhel-80-64-bit
- enterprise-rhel-80-64-bit-coverage
- enterprise-rhel-8-64-bit
- enterprise-rhel-8-64-bit-coverage
- enterprise-rhel-81-ppc64le
- enterprise-rhel-82-arm64
- enterprise-rhel-8-arm64
- enterprise-rhel-83-s390x
- enterprise-rhel-90-64-bit
- enterprise-rhel-90-arm64
@ -43,16 +43,16 @@ build_variant_large_distro_exceptions:
- macos-arm64
- macos-debug-suggested
- rhel70
- rhel80
- rhel80-debug-asan
- rhel80-debug-asan-all-feature-flags
- rhel80-debug-asan-classic-engine
- rhel80-debug-aubsan-lite
- rhel80-debug-suggested
- rhel80-debug-ubsan
- rhel80-debug-ubsan-all-feature-flags
- rhel80-debug-ubsan-classic-engine
- rhel-82-arm64
- rhel8
- rhel8-debug-asan
- rhel8-debug-asan-all-feature-flags
- rhel8-debug-asan-classic-engine
- rhel8-debug-aubsan-lite
- rhel8-debug-suggested
- rhel8-debug-ubsan
- rhel8-debug-ubsan-all-feature-flags
- rhel8-debug-ubsan-classic-engine
- rhel-8-arm64
- rhel90
- rhel90-arm64
- suse12

View File

@ -7,5 +7,5 @@ function setup_db_contrib_tool {
python -m pip --disable-pip-version-check install "pip==21.0.1" "wheel==0.37.0" || exit 1
python -m pip --disable-pip-version-check install "pipx" || exit 1
pipx install "db-contrib-tool==0.7.0" --pip-args="--no-cache-dir" || exit 1
pipx install "db-contrib-tool==0.8.3" --pip-args="--no-cache-dir" || exit 1
}

View File

@ -27,7 +27,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then
# Use the RHEL 8 all feature flags variant for the classic engine variant. The original
# classic engine variant is not a required builder and therefore not captured in patch
# test failure history.
tags_build_variant="enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required"
tags_build_variant="enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
fi
$python buildscripts/testmatrix/getdisplaytaskname.py "${task_name}" "${build_variant}" > display_task_name.txt
@ -105,7 +105,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then
set -o errexit
# Reduce the JSHeapLimit for the serial_run task task on Code Coverage builder variant.
if [[ "${build_variant}" = "enterprise-rhel-80-64-bit-coverage" && "${task_name}" = "serial_run" ]]; then
if [[ "${build_variant}" = "enterprise-rhel-8-64-bit-coverage" && "${task_name}" = "serial_run" ]]; then
extra_args="$extra_args --mongodSetParameter \"{'jsHeapLimitMB':10}\""
fi

View File

@ -243,7 +243,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -234,7 +234,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -241,7 +241,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -250,7 +250,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -220,7 +220,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -209,7 +209,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -216,7 +216,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -227,7 +227,7 @@ MongoDB features:
This package provides the MongoDB static library and header files needed to develop MongoDB client software.
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8
%global debug_package %{nil}
%prep

View File

@ -5529,7 +5529,7 @@ buildvariants:
- name: format-linux-no-ftruncate
- name: rhel80
display_name: RHEL 8.0
display_name: RHEL 8
run_on:
- rhel80-test
expansions: