xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
GitOrigin-RevId: 45e7c2e9741e5c7238c75a3b8e990fda7d0bf039
This commit is contained in:
Zack Winter
2024-07-15 01:30:11 -07:00
committed by MongoDB Bot
parent f41cffd963
commit b21319f2e4
30 changed files with 248 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildscripts/burn_in_tests.py
View File

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

2
buildscripts/evergreen_burn_in_tests.py
View File

@@ -30,7 +30,7 @@ from buildscripts.util.taskname import name_generated_task
from buildscripts.util.teststats import TestRuntime, HistoricTaskData
DEFAULT_PROJECT = "mongodb-mongo-master"
DEFAULT_VARIANT = "enterprise-rhel-80-64-bit-dynamic-required"
DEFAULT_VARIANT = "enterprise-rhel-8-64-bit-dynamic-required"
BURN_IN_TESTS_GEN_TASK = "burn_in_tests_gen"
BURN_IN_TESTS_TASK = "burn_in_tests"
BURN_IN_ENV_VAR = "BURN_IN_TESTS"

4
buildscripts/evergreen_resmoke_job_count.py
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},
]

16
buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml
View File

@@ -110,24 +110,24 @@ 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
platform: rhel8
architecture: arm64
- name: enterprise-rhel-82-arm64
- name: enterprise-rhel-8-arm64
edition: enterprise
platform: rhel82
platform: rhel8
architecture: arm64
- name: enterprise-rhel-71-ppc64le

2
buildscripts/resmokelib/utils/__init__.py
View File

@@ -85,7 +85,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)

2
buildscripts/testmatrix/getdisplaytaskname.py
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
"""

32
buildscripts/tests/test_burn_in_tags.py
View File

@@ -35,7 +35,7 @@ def ns(relative_name): # pylint: disable-invalid-name
def get_expansions_data():
return {
"branch_name": "fake_branch",
"build_variant": "enterprise-rhel-80-64-bit-suggested",
"build_variant": "enterprise-rhel-8-64-bit-suggested",
"check_evergreen": 2,
"distro_id": "rhel80-small",
"is_patch": "true",
@@ -69,9 +69,9 @@ class TestCreateEvgBuildVariantMap(unittest.TestCase):
class TestGenerateEvgBuildVariants(unittest.TestCase):
def test_generate_evg_buildvariant_one_base_variant(self):
evg_conf_mock = get_evergreen_config()
base_variant = "enterprise-rhel-80-64-bit-inmem"
generated_variant = "enterprise-rhel-80-64-bit-inmem-required"
burn_in_tags_gen_variant = "enterprise-rhel-80-64-bit"
base_variant = "enterprise-rhel-8-64-bit-inmem"
generated_variant = "enterprise-rhel-8-64-bit-inmem-required"
burn_in_tags_gen_variant = "enterprise-rhel-8-64-bit"
variant = evg_conf_mock.get_variant(base_variant)
build_variant = under_test._generate_evg_build_variant(variant, generated_variant,
@@ -93,9 +93,9 @@ class TestGenerateEvgTasks(unittest.TestCase):
create_tests_by_task_mock.return_value = {}
expansions_file_data = get_expansions_data()
buildvariant_map = {
"enterprise-rhel-80-64-bit-inmem": "enterprise-rhel-80-64-bit-inmem-required",
"enterprise-rhel-80-64-bit-majority-read-concern-off":
"enterprise-rhel-80-64-bit-majority-read-concern-off-required",
"enterprise-rhel-8-64-bit-inmem": "enterprise-rhel-8-64-bit-inmem-required",
"enterprise-rhel-8-64-bit-majority-read-concern-off":
"enterprise-rhel-8-64-bit-majority-read-concern-off-required",
} # yapf: disable
shrub_config = ShrubProject()
evergreen_api = MagicMock()
@@ -118,14 +118,14 @@ class TestGenerateEvgTasks(unittest.TestCase):
tests=["jstests/aggregation/ifnull.js"],
require_multiversion_setup=False,
distro="",
build_variant="enterprise-rhel-80-64-bit-inmem"
build_variant="enterprise-rhel-8-64-bit-inmem"
)
} # yapf: disable
expansions_file_data = get_expansions_data()
buildvariant_map = {
"enterprise-rhel-80-64-bit-inmem": "enterprise-rhel-80-64-bit-inmem-required",
"enterprise-rhel-80-64-bit-majority-read-concern-off":
"enterprise-rhel-80-64-bit-majority-read-concern-off-required",
"enterprise-rhel-8-64-bit-inmem": "enterprise-rhel-8-64-bit-inmem-required",
"enterprise-rhel-8-64-bit-majority-read-concern-off":
"enterprise-rhel-8-64-bit-majority-read-concern-off-required",
} # yapf: disable
shrub_config = ShrubProject.empty()
evergreen_api = MagicMock()
@@ -152,7 +152,7 @@ class TestGenerateEvgTasks(unittest.TestCase):
EXPANSIONS_FILE_DATA = {
"build_variant": "enterprise-rhel-80-64-bit",
"build_variant": "enterprise-rhel-8-64-bit",
"revision": "badf00d000000000000000000000000000000000", "max_revisions": "1000",
"branch_name": "mongodb-mongo-master", "is_patch": "false", "distro_id": "rhel62-small",
"repeat_tests_min": "2", "repeat_tests_max": "1000", "repeat_tests_secs": "600", "project":
@@ -160,10 +160,10 @@ EXPANSIONS_FILE_DATA = {
}
CREATE_EVG_BUILD_VARIANT_MAP = {
'enterprise-rhel-80-64-bit-majority-read-concern-off':
'enterprise-rhel-80-64-bit-majority-read-concern-off-required',
'enterprise-rhel-80-64-bit-inmem':
'enterprise-rhel-80-64-bit-inmem-required'
'enterprise-rhel-8-64-bit-majority-read-concern-off':
'enterprise-rhel-8-64-bit-majority-read-concern-off-required',
'enterprise-rhel-8-64-bit-inmem':
'enterprise-rhel-8-64-bit-inmem-required'
}
CREATE_TEST_MEMBERSHIP_MAP = {

22
buildscripts/tests/test_burn_in_tags_evergreen.yml
View File

@@ -60,11 +60,11 @@ tasks:
resmoke_args: --suites=aggregation --storageEngine=wiredTiger
buildvariants:
- name: enterprise-rhel-80-64-bit
display_name: "! Enterprise RHEL 8.0"
- name: enterprise-rhel-8-64-bit
display_name: "! Enterprise RHEL 8"
expansions:
multiversion_platform: rhel80
burn_in_tag_include_build_variants: enterprise-rhel-80-64-bit-majority-read-concern-off enterprise-rhel-80-64-bit-inmem
burn_in_tag_include_build_variants: enterprise-rhel-8-64-bit-majority-read-concern-off enterprise-rhel-8-64-bit-inmem
tasks:
- name: compile_all_run_unittests_TG
distros:
@@ -80,11 +80,11 @@ buildvariants:
multiversion_platform: rhel80
tasks:
- name: burn_in_tags_gen
- name: enterprise-rhel-80-64-bit-majority-read-concern-off
display_name: "Enterprise RHEL 8.0 (majority read concern off)"
- name: enterprise-rhel-8-64-bit-majority-read-concern-off
display_name: "Enterprise RHEL 8 (majority read concern off)"
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-majority-read-concern-off-expansions
expansions: &enterprise-rhel-8-64-bit-majority-read-concern-off-expansions
multiversion_edition: enterprise
tasks:
- name: compile_all_run_unittests_TG
@@ -92,11 +92,11 @@ buildvariants:
- rhel80-large
- name: aggregation_multiversion_fuzzer_gen
- name: aggregation
- 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)
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-inmem-expansions
expansions: &enterprise-rhel-8-64-bit-inmem-expansions
test_flags: >-
--majorityReadConcern=off
--excludeWithAnyTags=requires_majority_read_concern,uses_prepare_transaction,uses_multi_shard_transaction,uses_atclustertime
@@ -113,8 +113,8 @@ buildvariants:
large_distro_name: rhel80-large
tasks:
- name: compile
- 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)
expansions:
additional_targets: archive-mongocryptd archive-mongocryptd-debug
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo)

2
buildscripts/tests/test_evergreen_burn_in_tests.py
View File

@@ -100,7 +100,7 @@ class TestAcceptance(unittest.TestCase):
# introduce failures and require this test to be updated.
# You can see the test file it is using below. This test is used in the 'auth' and
# 'auth_audit' test suites. It needs to be in at least one of those for the test to pass.
variant = "enterprise-rhel-80-64-bit-inmem"
variant = "enterprise-rhel-8-64-bit-inmem"
repos = [mock_changed_git_files(["jstests/auth/auth1.js"])]
repeat_config = under_test.RepeatConfig()
gen_config = under_test.GenerateConfig(

8
buildscripts/tests/test_selected_tests.py
View File

@@ -135,7 +135,7 @@ class TestAcceptance(unittest.TestCase):
# assert that generated suite files have the suite name and the variant name in the
# filename, to prevent tasks on different variants from using the same suite file
self.assertIn("auth_enterprise-rhel-80-64-bit-dynamic-required_0.yml", files_to_generate)
self.assertIn("auth_enterprise-rhel-8-64-bit-dynamic-required_0.yml", files_to_generate)
generated_evg_config_raw = [
gen_file.content for gen_file in generated_config.file_list
@@ -147,7 +147,7 @@ class TestAcceptance(unittest.TestCase):
# jstests/auth/auth1.js belongs to two suites, auth and auth_audit,
rhel_80_with_generated_tasks = next(
(variant for variant in build_variants_with_generated_tasks
if variant["name"] == "enterprise-rhel-80-64-bit-dynamic-required"), None)
if variant["name"] == "enterprise-rhel-8-64-bit-dynamic-required"), None)
self.assertEqual(len(rhel_80_with_generated_tasks["tasks"]), 2)
@unittest.skipIf(sys.platform.startswith("win"), "not supported on windows")
@@ -168,7 +168,7 @@ class TestAcceptance(unittest.TestCase):
mock_task_mapping = TaskMapping(
branch="master", project="mongodb-mongo-master", repo="mongodb/mongo",
source_file="src/file1.cpp", source_file_seen_count=8,
tasks=[TaskMapInstance(name="auth", variant="enterprise-rhel-80", flip_count=5)])
tasks=[TaskMapInstance(name="auth", variant="enterprise-rhel-8", flip_count=5)])
mock_selected_tests_client = MagicMock()
mock_selected_tests_client.get_task_mappings.return_value = TaskMappingsResponse(
task_mappings=[mock_task_mapping])
@@ -194,7 +194,7 @@ class TestAcceptance(unittest.TestCase):
build_variants_with_generated_tasks = generated_evg_config["buildvariants"]
rhel_80_with_generated_tasks = next(
(variant for variant in build_variants_with_generated_tasks
if variant["name"] == "enterprise-rhel-80-64-bit-dynamic-required"), None)
if variant["name"] == "enterprise-rhel-8-64-bit-dynamic-required"), None)
self.assertEqual(len(rhel_80_with_generated_tasks["tasks"]), 5)

6
buildscripts/tests/util/test_taskname.py
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-required"
bv = "enterprise-rhel-8-64-bit-dynamic-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-required"
bv = "enterprise-rhel-8-64-bit-dynamic-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-required"
bv = "enterprise-rhel-8-64-bit-dynamic-required"
task_name = "auth"
base_task_name = under_test.determine_task_base_name(task_name, bv)

250
etc/evergreen.yml
View File

@@ -345,13 +345,13 @@ buildvariants:
tasks:
- name: tla_plus
- &enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel80-dynamic-v4gcc-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8.0 v4 Toolchain GCC DEBUG"
- &enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel8-dynamic-v4gcc-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8 v4 Toolchain GCC DEBUG"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
expansions: &enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
expansions: &enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --variables-files=etc/scons/mongodbtoolchain_testing_gcc.vars --use-diagnostic-latches=on
has_packages: false
@@ -359,7 +359,7 @@ buildvariants:
scons_cache_mode: all
large_distro_name: rhel80-medium
num_scons_link_jobs_available: 0.99
tasks: &enterprise-rhel80-dynamic-v4gcc-debug-experimental-tasks
tasks: &enterprise-rhel8-dynamic-v4gcc-debug-experimental-tasks
- name: compile_test_and_package_parallel_core_stream_TG
distros:
- rhel80-xlarge
@@ -431,29 +431,29 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel80-dynamic-v4clang-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8.0 v4 Toolchain Clang DEBUG"
- <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel8-dynamic-v4clang-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8 v4 Toolchain Clang DEBUG"
expansions:
<<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
<<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --variables-files=etc/scons/mongodbtoolchain_testing_clang.vars --use-diagnostic-latches=on
- <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel80-dynamic-v4gcc-cxx20-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8.0 v4 Toolchain GCC C++20 DEBUG"
- <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel8-dynamic-v4gcc-cxx20-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8 v4 Toolchain GCC C++20 DEBUG"
expansions:
<<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
<<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --variables-files=etc/scons/mongodbtoolchain_testing_gcc.vars --cxx-std=20 --use-diagnostic-latches=on
- <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel80-dynamic-v4clang-cxx20-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8.0 v4 Toolchain Clang C++20 DEBUG"
- <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel8-dynamic-v4clang-cxx20-debug-experimental
display_name: "~ Shared Library Enterprise RHEL 8 v4 Toolchain Clang C++20 DEBUG"
expansions:
<<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
<<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --variables-files=etc/scons/mongodbtoolchain_testing_clang.vars --cxx-std=20 --use-diagnostic-latches=on
- name: enterprise-rhel-80-64-bit-coverage
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage"
- name: 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
@@ -477,7 +477,7 @@ buildvariants:
use_scons_cache: false
gcov_tool: /opt/mongodbtoolchain/v3/bin/gcov
num_scons_link_jobs_available: 0.99
tasks: &enterprise-rhel-80-64-bit-coverage-tasks
tasks: &enterprise-rhel-8-64-bit-coverage-tasks
- name: compile_test_and_package_parallel_core_stream_TG
distros:
- rhel80-large
@@ -533,8 +533,8 @@ buildvariants:
#- name: snmp
#- name: update_fuzzer_gen
- name: 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
display_name: "~ Enterprise RHEL 8 DEBUG Code Coverage (clang)"
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@@ -562,10 +562,10 @@ buildvariants:
gcov_tool: /opt/mongodbtoolchain/v3/bin/gcov
num_scons_link_jobs_available: 0.99
tasks:
*enterprise-rhel-80-64-bit-coverage-tasks
*enterprise-rhel-8-64-bit-coverage-tasks
- name: enterprise-rhel-80-64-bit-coverage-experimental
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage (v4)"
- name: enterprise-rhel-8-64-bit-coverage-experimental
display_name: "~ Enterprise RHEL 8 DEBUG Code Coverage (v4)"
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@@ -590,10 +590,10 @@ buildvariants:
gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov
num_scons_link_jobs_available: 0.99
tasks:
*enterprise-rhel-80-64-bit-coverage-tasks
*enterprise-rhel-8-64-bit-coverage-tasks
- name: enterprise-rhel-80-64-bit-coverage-clang-experimental
display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage (v4 clang)"
- name: enterprise-rhel-8-64-bit-coverage-clang-experimental
display_name: "~ Enterprise RHEL 8 DEBUG Code Coverage (v4 clang)"
run_on:
- rhel80-medium
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@@ -618,10 +618,10 @@ buildvariants:
gcov_tool: /opt/mongodbtoolchain/v4/bin/llvm-cov gcov
num_scons_link_jobs_available: 0.99
tasks:
*enterprise-rhel-80-64-bit-coverage-tasks
*enterprise-rhel-8-64-bit-coverage-tasks
- name: enterprise-rhel-80-64-bit-bson-column
display_name: "~ Shared Library Enterprise RHEL 8.0 (BSONColumn validate)"
- name: enterprise-rhel-8-64-bit-bson-column
display_name: "~ Shared Library Enterprise RHEL 8 (BSONColumn validate)"
run_on:
- rhel80-small
expansions:
@@ -730,36 +730,36 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
#- <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
# name: enterprise-rhel80-dynamic-v4gcc-cxx20-debug-pm-1328-experimental
# display_name: "~ Shared Library Enterprise RHEL 8.0 v4 Toolchain GCC C++20 DEBUG + PM-1328"
#- <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
# name: enterprise-rhel8-dynamic-v4gcc-cxx20-debug-pm-1328-experimental
# display_name: "~ Shared Library Enterprise RHEL 8 v4 Toolchain GCC C++20 DEBUG + PM-1328"
# cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
# expansions:
# <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
# <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
# compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --variables-files=etc/scons/mongodbtoolchain_testing_gcc.vars --cxx-std=20 --experimental-optimization=* --experimental-runtime-hardening=* --disable-warnings-as-errors
- <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel80-dynamic-v4clang-cxx20-debug-pm-1328-experimental
display_name: "~ Shared Library Enterprise RHEL 8.0 v4 Toolchain Clang C++20 DEBUG + PM-1328"
- <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel8-dynamic-v4clang-cxx20-debug-pm-1328-experimental
display_name: "~ Shared Library Enterprise RHEL 8 v4 Toolchain Clang C++20 DEBUG + PM-1328"
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
expansions:
<<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
<<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic --variables-files=etc/scons/mongodbtoolchain_testing_clang.vars --cxx-std=20 --experimental-optimization=* --experimental-runtime-hardening=* --use-diagnostic-latches=on
- <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel80-v4gcc-cxx20-pm-1328-experimental
display_name: "~ Enterprise RHEL 8.0 v4 Toolchain GCC C++20 + PM-1328"
- <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel8-v4gcc-cxx20-pm-1328-experimental
display_name: "~ Enterprise RHEL 8 v4 Toolchain GCC C++20 + PM-1328"
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
expansions:
<<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
<<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
compile_flags: --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_testing_gcc.vars --cxx-std=20 --experimental-optimization=* --experimental-runtime-hardening=* --disable-warnings-as-errors --use-diagnostic-latches=on
- <<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel80-v4clang-cxx20-pm-1328-experimental
display_name: "~ Enterprise RHEL 8.0 v4 Toolchain Clang C++20 + PM-1328"
- <<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-template
name: enterprise-rhel8-v4clang-cxx20-pm-1328-experimental
display_name: "~ Enterprise RHEL 8 v4 Toolchain Clang C++20 + PM-1328"
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
expansions:
<<: *enterprise-rhel80-dynamic-v4gcc-debug-experimental-expansions
<<: *enterprise-rhel8-dynamic-v4gcc-debug-experimental-expansions
compile_flags: --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_testing_clang.vars --cxx-std=20 --experimental-optimization=* --experimental-runtime-hardening=* --use-diagnostic-latches=on
- name: stm-daily-cron
@@ -1258,13 +1258,13 @@ buildvariants:
# Redhat buildvariants #
###########################################
- &enterprise-rhel-80-64-bit-dynamic-required-template
name: enterprise-rhel-80-64-bit-dynamic-required
display_name: "! Shared Library Enterprise RHEL 8.0"
- &enterprise-rhel-8-64-bit-dynamic-required-template
name: 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-required-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-required-expansions
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --use-diagnostic-latches=on
crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
@@ -1405,14 +1405,14 @@ buildvariants:
- name: vector_search_ssl
- name: generate_buildid_to_debug_symbols_mapping
- &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-template
name: enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required
display_name: "! Shared Library Enterprise RHEL 8.0 (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
display_name: "! Shared Library Enterprise RHEL 8 (all feature flags)"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
stepback: false
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-expansions
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --use-diagnostic-latches=on
crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
@@ -1436,7 +1436,7 @@ buildvariants:
# WARNING! Task splitting is not supported for burn-in tasks. Large unsplitted `_gen` tasks may
# run too long and hit execution timeouts.
# burn_in_task_name: jsCore
tasks: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-tasks
tasks: &enterprise-rhel-8-64-bit-dynamic-all-feature-flags-tasks
- name: cqf
- name: cqf_parallel
- name: compile_test_and_package_parallel_core_stream_TG
@@ -1549,14 +1549,14 @@ 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
display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)"
- &enterprise-rhel-8-64-bit-dynamic-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.
stepback: false
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-classic-engine-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-classic-engine-expansions
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --use-diagnostic-latches=on
multiversion_platform: rhel80
@@ -1671,8 +1671,8 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- name: 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
display_name: "Enterprise RHEL 8 (large transactions format)"
run_on:
- rhel80-small
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@@ -1752,13 +1752,13 @@ buildvariants:
# This build variant is used to run multiversion tests as part of burn_in_tags as these tests are
# currently only run on our daily builders.
- &enterprise-rhel-80-64-bit-multiversion-template
name: enterprise-rhel-80-64-bit-multiversion
display_name: "Enterprise RHEL 8.0 (implicit multiversion)"
- &enterprise-rhel-8-64-bit-multiversion-template
name: 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
expansions: &enterprise-rhel-80-64-bit-multiversion-expansions-template
expansions: &enterprise-rhel-8-64-bit-multiversion-expansions-template
compile_flags: >-
-j$(grep -c ^processor /proc/cpuinfo)
--ssl
@@ -1790,12 +1790,12 @@ buildvariants:
- name: .multiversion_passthrough
- name: .random_multiversion_ds
- <<: *enterprise-rhel-80-64-bit-multiversion-template
name: enterprise-rhel-80-64-bit-multiversion-all-feature-flags
display_name: "Enterprise RHEL 8.0 (implicit multiversion & all feature flags)"
- <<: *enterprise-rhel-8-64-bit-multiversion-template
name: enterprise-rhel-8-64-bit-multiversion-all-feature-flags
display_name: "Enterprise RHEL 8 (implicit multiversion & all feature flags)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
expansions:
<<: *enterprise-rhel-80-64-bit-multiversion-expansions-template
<<: *enterprise-rhel-8-64-bit-multiversion-expansions-template
# No feature flag tests since they aren't compatible with the older binaries.
test_flags: >-
--runNoFeatureFlagTests
@@ -1815,8 +1815,8 @@ buildvariants:
- name: .multiversion_passthrough
- name: .random_multiversion_ds
- name: 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
display_name: "Enterprise RHEL 8 (future git tag multiversion)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@@ -1857,8 +1857,8 @@ buildvariants:
- name: .multiversion !.future_git_tag_incompatible
- name: .multiversion_future_git_tag
#- name: rhel-80-64-bit-nossl
# display_name: "RHEL 8.0 Shared Library (No SSL)"
#- name: rhel-8-64-bit-nossl
# display_name: "RHEL 8 Shared Library (No SSL)"
# run_on:
# - rhel80-small
# cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
@@ -1888,9 +1888,9 @@ buildvariants:
# - rhel80-large
# - name: jsCore
- &enterprise-rhel-80-64-bit-suggested-template
name: enterprise-rhel-80-64-bit-suggested
display_name: "* Enterprise RHEL 8.0"
- &enterprise-rhel-8-64-bit-suggested-template
name: 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
@@ -2088,7 +2088,7 @@ buildvariants:
- name: generate_buildid_to_debug_symbols_mapping
- name: enterprise-rhel80-dynamic-clang-tidy-required
- name: enterprise-rhel8-dynamic-clang-tidy-required
display_name: "! Enterprise Clang Tidy"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
@@ -2109,8 +2109,8 @@ buildvariants:
- name: clang_tidy_TG
- name: rhel80-debug-suggested
display_name: "* Shared Library RHEL 8.0 DEBUG"
- name: rhel8-debug-suggested
display_name: "* Shared Library RHEL 8 DEBUG"
cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter
run_on:
- rhel80-small
@@ -2151,8 +2151,8 @@ buildvariants:
# storage engine buildvariants #
################################
- name: enterprise-rhel-80-benchmarks
display_name: Enterprise RHEL 8.0 (Benchmarks)
- name: enterprise-rhel-8-benchmarks
display_name: Enterprise RHEL 8 (Benchmarks)
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-medium
@@ -2219,8 +2219,8 @@ buildvariants:
# Experimental buildvariants #
###########################################
- name: rhel80-debug-asan-all-feature-flags
display_name: "~ Shared Library ASAN Enterprise RHEL 8.0 DEBUG (all feature flags)"
- name: rhel8-debug-asan-all-feature-flags
display_name: "~ Shared Library ASAN Enterprise RHEL 8 DEBUG (all feature flags)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-build
@@ -2297,8 +2297,8 @@ buildvariants:
# - name: server_discovery_and_monitoring_json_test_TG
# - name: server_selection_json_test_TG
- name: rhel80-debug-asan-classic-engine
display_name: ~ ASAN Enterprise RHEL 8.0 DEBUG (Classic Engine)
- name: 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
@@ -2368,8 +2368,8 @@ buildvariants:
- name: server_discovery_and_monitoring_json_test_TG
- name: server_selection_json_test_TG
- name: rhel80-debug-ubsan-all-feature-flags
display_name: "~ Shared Library UBSAN Enterprise RHEL 8.0 DEBUG (all feature flags)"
- name: 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
@@ -2439,8 +2439,8 @@ buildvariants:
# - name: server_discovery_and_monitoring_json_test_TG
# - name: server_selection_json_test_TG
- name: rhel80-debug-ubsan-classic-engine
display_name: "~ UBSAN Enterprise RHEL 8.0 DEBUG (Classic Engine)"
- name: 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
@@ -2504,9 +2504,9 @@ buildvariants:
- name: server_discovery_and_monitoring_json_test_TG
- name: server_selection_json_test_TG
- &rhel80-debug-aubsan-lite-required-template
name: rhel80-debug-aubsan-lite-required
display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG"
- &rhel8-debug-aubsan-lite-required-template
name: 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
@@ -2542,9 +2542,9 @@ buildvariants:
- name: unittest_shell_hang_analyzer_gen
- name: generate_buildid_to_debug_symbols_mapping
- <<: *rhel80-debug-aubsan-lite-required-template
name: 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-required-template
name: 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:
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -2576,8 +2576,8 @@ buildvariants:
# - name: unittest_shell_hang_analyzer_gen
- name: generate_buildid_to_debug_symbols_mapping
- name: enterprise-rhel80-debug-tsan
display_name: ~ TSAN Enterprise RHEL 8.0 DEBUG
- name: enterprise-rhel8-debug-tsan
display_name: ~ TSAN Enterprise RHEL 8 DEBUG
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-large
@@ -2608,8 +2608,8 @@ buildvariants:
- name: compile_test_and_package_parallel_unittest_stream_TG
- name: jsCore
- name: enterprise-rhel80-unoptimized-64-bit
display_name: "~ Enterprise RHEL 8.0 DEBUG (Unoptimized)"
- name: enterprise-rhel8-unoptimized-64-bit
display_name: "~ Enterprise RHEL 8 DEBUG (Unoptimized)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
expansions:
compile_flags: MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --dbg=on --opt=off --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --detect-odr-violations --use-diagnostic-latches=on
@@ -2627,8 +2627,8 @@ buildvariants:
distros:
- rhel80-build
- name: enterprise-rhel80-fixed-service-executor-64-bit
display_name: "~ Enterprise RHEL 8.0 (with FixedServiceExecutor)"
- name: 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
@@ -2665,8 +2665,8 @@ buildvariants:
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.csrs
- name: 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
display_name: "~ Enterprise RHEL 8 (with SdamReplicaSetMonitor)"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@@ -2702,8 +2702,8 @@ buildvariants:
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.csrs
- name: enterprise-rhel80-task-executor-pool-size-64-bit
display_name: "~ Enterprise RHEL 8.0 (with {taskExecutorPoolSize: 4})"
- name: enterprise-rhel8-task-executor-pool-size-64-bit
display_name: "~ Enterprise RHEL 8 (with {taskExecutorPoolSize: 4})"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@@ -2737,8 +2737,8 @@ buildvariants:
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.csrs
- name: 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
display_name: "~ Enterprise RHEL 8 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"})"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@@ -2773,8 +2773,8 @@ buildvariants:
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.csrs
- name: 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
display_name: "~ Enterprise RHEL 8 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"})"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@@ -2809,8 +2809,8 @@ buildvariants:
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.csrs
- name: 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
display_name: "~ Enterprise RHEL 8 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"})"
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- rhel80-small
@@ -2845,8 +2845,8 @@ buildvariants:
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.csrs
- name: enterprise-rhel80-join-ingress-sessions-on-shutdown
display_name: "~ Enterprise RHEL 8.0 (with {joinIngressSessionsOnShutdown: \"true\"})"
- name: enterprise-rhel8-join-ingress-sessions-on-shutdown
display_name: "~ Enterprise RHEL 8 (with {joinIngressSessionsOnShutdown: \"true\"})"
activate: false
run_on:
- rhel80-small
@@ -2903,7 +2903,7 @@ buildvariants:
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
stepback: false
expansions:
selected_tests_buildvariants: enterprise-windows-required linux-64-debug-required enterprise-ubuntu-dynamic-1604-clang rhel80-debug-aubsan-lite-required
selected_tests_buildvariants: enterprise-windows-required linux-64-debug-required enterprise-ubuntu-dynamic-1604-clang rhel8-debug-aubsan-lite-required
tasks:
- name: selected_tests_gen
@@ -2927,12 +2927,12 @@ buildvariants:
- windows-vsCurrent-large
### QO & QE Patch-Specific Build Variants ###
- <<: *enterprise-rhel-80-64-bit-dynamic-classic-engine
name: 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
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-classic-engine-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-classic-engine-expansions
jstestfuzz_num_generated_files: 20
jstestfuzz_concurrent_num_files: 5
target_resmoke_time: 30
@@ -2941,12 +2941,12 @@ buildvariants:
--mongodSetParameters="{internalQueryForceClassicEngine: true}"
--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
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
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
@@ -3007,8 +3007,8 @@ buildvariants:
distros:
- windows-vsCurrent-large
- name: rhel80-debug-aubsan-lite_fuzzer
display_name: "{A,UB}SAN Enterprise RHEL 8.0 FUZZER"
- name: 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

28
etc/evergreen_nightly.yml
View File

@@ -163,13 +163,13 @@ buildvariants:
- name: snmp
- name: unittest_shell_hang_analyzer_gen
- &enterprise-rhel-80-64-bit-dynamic-required-template
name: enterprise-rhel-80-64-bit-dynamic-required
display_name: "! Shared Library Enterprise RHEL 8.0"
- &enterprise-rhel-8-64-bit-dynamic-required-template
name: enterprise-rhel-8-64-bit-dynamic-required
display_name: "! Shared Library Enterprise RHEL 8"
cron: "0 */4 * * *" # Every 4 hours starting at midnight
run_on:
- rhel80-small
expansions: &enterprise-rhel-80-64-bit-dynamic-required-expansions
expansions: &enterprise-rhel-8-64-bit-dynamic-required-expansions
additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic
crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique"
@@ -365,7 +365,7 @@ buildvariants:
- name: jsCore_txns
- name: unittest_shell_hang_analyzer_gen
- <<: *enterprise-rhel-80-64-bit-dynamic-required-template
- <<: *enterprise-rhel-8-64-bit-dynamic-required-template
name: commit-queue
display_name: "~ Commit Queue"
cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter
@@ -389,12 +389,12 @@ buildvariants:
- name: check_feature_flag_tags
# Temporary variant to stress a component and gather more data.
- <<: *enterprise-rhel-80-64-bit-dynamic-required-template
name: enterprise-rhel-80-64-bit-dynamic-stress-initialsyncid # For BF-25011
display_name: "~ Shared Library Enterprise RHEL 8.0 (initialSyncId stress test)"
- <<: *enterprise-rhel-8-64-bit-dynamic-required-template
name: enterprise-rhel-8-64-bit-dynamic-stress-initialsyncid # For BF-25011
display_name: "~ Shared Library Enterprise RHEL 8 (initialSyncId stress test)"
cron: "0 */1 * * *" # Every hour starting at midnight
expansions:
<<: *enterprise-rhel-80-64-bit-dynamic-required-expansions
<<: *enterprise-rhel-8-64-bit-dynamic-required-expansions
max_sub_suites: 10
# Set a low target time to run only 1 test per generated Evergreen task. Increase timeout.
target_resmoke_time: 1
@@ -409,8 +409,8 @@ buildvariants:
- rhel80-xlarge
- name: .sharding
- name: 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
display_name: "Enterprise RHEL 8 (large transactions format)"
run_on:
- rhel80-small
cron: "0 4 * * 0"
@@ -481,9 +481,9 @@ buildvariants:
- rhel80-medium
- name: generate_buildid_to_debug_symbols_mapping
- &enterprise-rhel-80-64-bit-dynamic-classic-engine
name: enterprise-rhel-80-64-bit-dynamic-classic-engine
display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)"
- &enterprise-rhel-8-64-bit-dynamic-classic-engine
name: enterprise-rhel-8-64-bit-dynamic-classic-engine
display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)"
cron: "0 4 * * 0"
run_on:
- rhel80-small

18
etc/evergreen_timeouts.yml
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,27 +39,27 @@ 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-all-feature-flags:
rhel8-debug-ubsan-all-feature-flags:
- task: update_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours
rhel80-debug-ubsan-classic-engine:
rhel8-debug-ubsan-classic-engine:
- task: update_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours
rhel80-debug-v4ubsan-all-feature-flags-experimental:
rhel8-debug-v4ubsan-all-feature-flags-experimental:
- task: update_timeseries_fuzzer
exec_timeout: 150 # 2.5 hours

28
etc/evergreen_yml_components/definitions.yml
View File

@@ -294,12 +294,12 @@ variables:
- enterprise-rhel-71-ppc64le
- enterprise-rhel-81-ppc64le
- enterprise-rhel-72-s390x
- enterprise-rhel-80-64-bit
- enterprise-rhel-80-64-bit-coverage
- enterprise-rhel-80-64-bit-inmem
- enterprise-rhel-80-64-bit-multiversion
- 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-inmem
- enterprise-rhel-8-64-bit-multiversion
- enterprise-rhel-8-64-bit-suggested
- enterprise-rhel-8-arm64
- enterprise-rhel-83-s390x
- enterprise-rhel-90-64-bit
- enterprise-rhel-90-arm64
@@ -327,10 +327,10 @@ variables:
- mh_variants: &mh_variants
- enterprise-macos
- enterprise-macos-arm64
- enterprise-rhel-80-64-bit
- enterprise-rhel-80-64-bit-dynamic-required
- enterprise-rhel-8-64-bit
- enterprise-rhel-8-64-bit-dynamic-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
@@ -365,13 +365,13 @@ variables:
- enterprise-rhel-81-ppc64le
- enterprise-rhel-72-s390x
- 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

4
etc/evergreen_yml_components/variants/in_memory.yml
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

18
etc/evergreen_yml_components/variants/misc_release.yml
View File

@@ -773,8 +773,8 @@ buildvariants:
- name: sharding_gen
- name: replica_sets_gen
- 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
@@ -824,12 +824,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 archive-mh archive-mh-debug
push_path: linux
push_bucket: downloads.10gen.com
@@ -945,8 +945,8 @@ buildvariants:
- name: vector_search_auth
- name: vector_search_ssl
- 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
@@ -992,8 +992,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

8
etc/evergreen_yml_components/variants/ninja.yml
View File

@@ -50,8 +50,8 @@ buildvariants:
distros:
- ubuntu1804-xlarge
- name: enterprise-rhel-80-64-bit-dynamic-required-ninja
display_name: "Ninja Build: Enterprise RHEL 8.0"
- name: enterprise-rhel-8-64-bit-dynamic-required-ninja
display_name: "Ninja Build: Enterprise RHEL 8"
cron: "0 4 * * 0" # Run once a week to ensure no failures introduced to ninja builds
run_on:
- rhel80-small
@@ -66,8 +66,8 @@ buildvariants:
distros:
- rhel80-xlarge
- name: enterprise-rhel80-ninja
display_name: "Ninja Build: RHEL 8.0"
- name: enterprise-rhel8-ninja
display_name: "Ninja Build: RHEL 8"
cron: "0 4 * * 0" # Run once a week to ensure no failures introduced to ninja builds
run_on:
- rhel80-small

12
etc/evergreen_yml_components/variants/sanitizer.yml
View File

@@ -3,8 +3,8 @@
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
@@ -26,8 +26,8 @@ buildvariants:
- name: .aggfuzzer .common
- name: .jstestfuzz !.initsync
- 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
@@ -98,8 +98,8 @@ buildvariants:
- name: server_discovery_and_monitoring_json_test_TG
- name: server_selection_json_test_TG
- 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

10
etc/generate_subtasks_config.yml
View File

@@ -25,10 +25,10 @@ build_variant_large_distro_exceptions:
- enterprise-rhel-71-ppc64le-inmem
- enterprise-rhel-72-s390x
- enterprise-rhel-72-s390x-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
@@ -46,8 +46,8 @@ build_variant_large_distro_exceptions:
- macos-arm64
- macos-debug-suggested
- rhel70
- rhel80
- rhel-82-arm64
- rhel8
- rhel-8-arm64
- rhel90
- rhel90-arm64
- suse12

2
evergreen/prelude_db_contrib_tool.sh
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
}

4
evergreen/resmoke_tests_execute.sh
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

2
rpm/mongodb-enterprise-init.spec
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

2
rpm/mongodb-enterprise-unstable-init.spec
View File

@@ -232,7 +232,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

2
rpm/mongodb-enterprise-unstable.spec
View File

@@ -239,7 +239,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

2
rpm/mongodb-enterprise.spec
View File

@@ -248,7 +248,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

2
rpm/mongodb-org-init.spec
View File

@@ -218,7 +218,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

2
rpm/mongodb-org-unstable-init.spec
View File

@@ -207,7 +207,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

2
rpm/mongodb-org-unstable.spec
View File

@@ -214,7 +214,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

2
rpm/mongodb-org.spec
View File

@@ -224,7 +224,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