summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neben <alexander.neben@mongodb.com>2022-12-14 17:29:35 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-12-14 18:18:24 +0000
commit9f94dc82053cd44d30aa25db80f07a46024ee7c8 (patch)
treed0b65bd3ec4db26bc36a438f9876962723ec04e0
parent410b904dc1336dfaaf110d807dd505e112bcaecd (diff)
downloadmongo-9f94dc82053cd44d30aa25db80f07a46024ee7c8.tar.gz
SERVER-71875 fuzzers no longer run on rhel 6.2
-rw-r--r--buildscripts/tests/test_burn_in_tags.py26
-rw-r--r--buildscripts/tests/test_burn_in_tags_evergreen.yml24
-rw-r--r--etc/evergreen.yml189
-rw-r--r--etc/generate_subtasks_config.yml2
4 files changed, 117 insertions, 124 deletions
diff --git a/buildscripts/tests/test_burn_in_tags.py b/buildscripts/tests/test_burn_in_tags.py
index d3872e235be..d6d96aa18cf 100644
--- a/buildscripts/tests/test_burn_in_tags.py
+++ b/buildscripts/tests/test_burn_in_tags.py
@@ -51,10 +51,10 @@ class TestCreateEvgBuildVariantMap(unittest.TestCase):
evg_conf_mock)
expected_buildvariant_map = {
- "enterprise-rhel-62-64-bit-majority-read-concern-off":
- "enterprise-rhel-62-64-bit-majority-read-concern-off-required",
- "enterprise-rhel-62-64-bit-inmem":
- "enterprise-rhel-62-64-bit-inmem-required"
+ "enterprise-rhel-70-64-bit-majority-read-concern-off":
+ "enterprise-rhel-70-64-bit-majority-read-concern-off-required",
+ "enterprise-rhel-70-64-bit-inmem":
+ "enterprise-rhel-70-64-bit-inmem-required"
}
self.assertEqual(buildvariant_map, expected_buildvariant_map)
@@ -72,8 +72,8 @@ 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-62-64-bit-inmem"
- generated_variant = "enterprise-rhel-62-64-bit-inmem-required"
+ base_variant = "enterprise-rhel-70-64-bit-inmem"
+ generated_variant = "enterprise-rhel-70-64-bit-inmem-required"
burn_in_tags_gen_variant = "enterprise-rhel-62-64-bit"
shrub_config = Configuration()
@@ -101,9 +101,9 @@ class TestGenerateEvgTasks(unittest.TestCase):
create_tests_by_task_mock.return_value = {}
expansions_file_data = get_expansions_data()
buildvariant_map = {
- "enterprise-rhel-62-64-bit-inmem": "enterprise-rhel-62-64-bit-inmem-required",
- "enterprise-rhel-62-64-bit-majority-read-concern-off":
- "enterprise-rhel-62-64-bit-majority-read-concern-off-required",
+ "enterprise-rhel-70-64-bit-inmem": "enterprise-rhel-70-64-bit-inmem-required",
+ "enterprise-rhel-70-64-bit-majority-read-concern-off":
+ "enterprise-rhel-70-64-bit-majority-read-concern-off-required",
} # yapf: disable
shrub_config = Configuration()
get_stats_from_s3_mock.return_value = []
@@ -129,9 +129,9 @@ class TestGenerateEvgTasks(unittest.TestCase):
} # yapf: disable
expansions_file_data = get_expansions_data()
buildvariant_map = {
- "enterprise-rhel-62-64-bit-inmem": "enterprise-rhel-62-64-bit-inmem-required",
- "enterprise-rhel-62-64-bit-majority-read-concern-off":
- "enterprise-rhel-62-64-bit-majority-read-concern-off-required",
+ "enterprise-rhel-70-64-bit-inmem": "enterprise-rhel-70-64-bit-inmem-required",
+ "enterprise-rhel-70-64-bit-majority-read-concern-off":
+ "enterprise-rhel-70-64-bit-majority-read-concern-off-required",
} # yapf: disable
shrub_config = Configuration()
repo = MagicMock()
@@ -152,4 +152,4 @@ class TestGenerateEvgTasks(unittest.TestCase):
self.assertEqual(first_generated_build_variant["display_tasks"][0]["name"], "burn_in_tests")
self.assertEqual(
first_generated_build_variant["display_tasks"][0]["execution_tasks"][0],
- "burn_in:aggregation_mongos_passthrough_0_enterprise-rhel-62-64-bit-inmem-required")
+ "burn_in:aggregation_mongos_passthrough_0_enterprise-rhel-70-64-bit-inmem-required")
diff --git a/buildscripts/tests/test_burn_in_tags_evergreen.yml b/buildscripts/tests/test_burn_in_tags_evergreen.yml
index 86e71e9f04a..6b233056a8b 100644
--- a/buildscripts/tests/test_burn_in_tags_evergreen.yml
+++ b/buildscripts/tests/test_burn_in_tags_evergreen.yml
@@ -25,7 +25,7 @@ buildvariants:
display_name: "! Enterprise RHEL 6.2"
expansions:
multiversion_platform: rhel62
- burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-inmem
+ burn_in_tag_buildvariants: enterprise-rhel-70-64-bit-majority-read-concern-off enterprise-rhel-70-64-bit-inmem
tasks:
- name: burn_in_tags_gen
- name: buildvariant-without-burn-in-tag-buildvariants
@@ -34,21 +34,21 @@ buildvariants:
multiversion_platform: rhel62
tasks:
- name: burn_in_tags_gen
- - name: enterprise-rhel-62-64-bit-majority-read-concern-off
- display_name: "Enterprise RHEL 6.2 (majority read concern off)"
+ - name: enterprise-rhel-70-64-bit-majority-read-concern-off
+ display_name: "Enterprise RHEL 7.0 (majority read concern off)"
modules: ["enterprise"]
run_on:
- - rhel62-small
- expansions: &enterprise-rhel-62-64-bit-majority-read-concern-off-expansions
+ - rhel70-small
+ expansions: &enterprise-rhel-70-64-bit-majority-read-concern-off-expansions
multiversion_edition: enterprise
tasks:
- name: compile
- - name: enterprise-rhel-62-64-bit-inmem
- display_name: Enterprise RHEL 6.2 (inMemory)
+ - name: enterprise-rhel-70-64-bit-inmem
+ display_name: Enterprise RHEL 7.0 (inMemory)
modules: ["enterprise"]
run_on:
- - rhel62-small
- expansions: &enterprise-rhel-62-64-bit-inmem-expansions
+ - rhel70-small
+ expansions: &enterprise-rhel-70-64-bit-inmem-expansions
test_flags: >-
--majorityReadConcern=off
--excludeWithAnyTags=requires_majority_read_concern,uses_prepare_transaction,uses_multi_shard_transaction,uses_atclustertime
@@ -57,11 +57,11 @@ buildvariants:
--ssl
--release
--variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- MONGO_DISTMOD=rhel62
- multiversion_platform: rhel62
+ MONGO_DISTMOD=rhel70
+ multiversion_platform: rhel70
multiversion_edition: enterprise
scons_cache_scope: shared
tooltags: "ssl sasl gssapi"
- large_distro_name: rhel62-large
+ large_distro_name: rhel70-large
tasks:
- name: compile
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 663b8ba2db5..4f7d09524fc 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -314,10 +314,10 @@ variables:
- enterprise-linux-64-amazon-ami
- enterprise-macos
- enterprise-rhel-62-64-bit
- - enterprise-rhel-62-64-bit-coverage
- - enterprise-rhel-62-64-bit-inmem
- - enterprise-rhel-62-64-bit-flow-control-off
- - enterprise-rhel-62-64-bit-majority-read-concern-off
+ - enterprise-rhel-70-64-bit-coverage
+ - enterprise-rhel-70-64-bit-inmem
+ - enterprise-rhel-70-64-bit-flow-control-off
+ - enterprise-rhel-70-64-bit-majority-read-concern-off
- enterprise-rhel-62-64-bit-multi-txn-oplog-entries
- enterprise-rhel-62-64-bit-required-inmem
- enterprise-rhel-62-64-bit-store-fam-images-in-side-coll
@@ -1166,7 +1166,7 @@ functions:
# Reduce the JSHeapLimit for the serial_run task task on Code Coverage builder variant.
- if [[ "${build_variant}" = "enterprise-rhel-62-64-bit-coverage" && "${task_name}" = "serial_run" ]]; then
+ if [[ "${build_variant}" = "enterprise-rhel-70-64-bit-coverage" && "${task_name}" = "serial_run" ]]; then
extra_args="$extra_args --mongodSetParameter {'jsHeapLimitMB':10}"
fi
@@ -7421,7 +7421,7 @@ buildvariants:
- name: linux-64-duroff
display_name: Linux (No Journal)
run_on:
- - rhel62-small
+ - rhel70-small
batchtime: 10080 # 7 days
expansions: &linux-64-required-duroff-expansions
push_path: linux
@@ -7429,7 +7429,7 @@ buildvariants:
push_name: linux-duroff
push_arch: x86_64
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-free-mon=off --enable-http-client=off
- multiversion_platform: rhel62
+ multiversion_platform: rhel70
multiversion_edition: targeted
# Running WiredTiger with --nojournal in a replica set is no longer supported, so this variant
# does not include replica set tests. Since transactions are only supported on replica sets, we
@@ -7438,11 +7438,11 @@ buildvariants:
scons_cache_scope: shared
tooltags: ""
build_mongoreplay: true
- large_distro_name: rhel62-large
+ large_distro_name: rhel70-large
tasks:
- name: compile_all_run_unittests_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: .aggfuzzer .common
- name: aggregation
- name: aggregation_auth
@@ -8649,7 +8649,7 @@ buildvariants:
jstestfuzz_concurrent_num_files: 10
target_resmoke_time: 10
large_distro_name: rhel62-large
- burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-inmem linux-64-duroff enterprise-rhel-62-64-bit-store-fam-images-in-side-coll
+ burn_in_tag_buildvariants: enterprise-rhel-70-64-bit-majority-read-concern-off enterprise-rhel-70-64-bit-inmem linux-64-duroff enterprise-rhel-70-64-bit-store-fam-images-in-side-coll
tasks:
- name: compile_all_run_unittests_TG
distros:
@@ -8663,7 +8663,6 @@ buildvariants:
distros:
- rhel62-large
- name: burn_in_tags_gen
- - name: .aggfuzzer
- name: .aggregation
- name: audit
- name: .auth
@@ -8681,7 +8680,6 @@ buildvariants:
- name: disk_wiredtiger
- name: .encrypt
- name: idl_tests
- - name: initial_sync_fuzzer_gen
- name: .integration
distros:
- rhel62-large
@@ -8690,7 +8688,6 @@ buildvariants:
- name: jsCore_op_query
- name: jsCore_txns_large_txns_format
- name: jsonSchema
- - name: .jstestfuzz
- name: .logical_session_cache
- name: .multi_shard
- name: multi_stmt_txn_jscore_passthrough_with_migration_gen
@@ -8707,7 +8704,6 @@ buildvariants:
distros:
- rhel62-large
- name: .read_only
- - name: .rollbackfuzzer
- name: sasl
- name: search_beta
- name: search_beta_auth
@@ -8722,7 +8718,6 @@ buildvariants:
- name: sharding_opportunistic_secondary_targeting_gen
- name: snmp
- name: .stitch
- - name: .updatefuzzer
- name: secondary_reads_passthrough_gen
- name: package
distros:
@@ -8731,24 +8726,24 @@ buildvariants:
distros:
- rhel62-small
-- name: enterprise-rhel-62-64-bit-store-fam-images-in-side-coll
- display_name: "Enterprise RHEL 6.2 (storeFindAndModifyImagesInSideCollection=True)"
+- name: enterprise-rhel-70-64-bit-store-fam-images-in-side-coll
+ display_name: "Enterprise RHEL 7.0 (storeFindAndModifyImagesInSideCollection=True)"
modules:
- enterprise
run_on:
- - rhel62-small
+ - rhel70-small
expansions:
test_flags: >-
--mongodSetParameters="{storeFindAndModifyImagesInSideCollection: true}"
--excludeWithAnyTags=requires_mmapv1,requires_storing_fam_images_in_oplog
mh_target: dist-mh
- compile_flags: --ssl MONGO_DISTMOD=rhel62 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- multiversion_platform: rhel62
+ compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+ multiversion_platform: rhel70
multiversion_edition: enterprise
has_packages: true
packager_script: packager_enterprise.py
packager_arch: x86_64
- packager_distro: rhel62
+ packager_distro: rhel70
repo_edition: enterprise
scons_cache_scope: shared
tooltags: "ssl sasl gssapi"
@@ -8756,15 +8751,15 @@ buildvariants:
jstestfuzz_num_generated_files: 40
jstestfuzz_concurrent_num_files: 10
target_resmoke_time: 10
- large_distro_name: rhel62-large
- burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-inmem linux-64-duroff
+ large_distro_name: rhel70-large
+ burn_in_tag_buildvariants: enterprise-rhel-70-64-bit-majority-read-concern-off enterprise-rhel-70-64-bit-inmem linux-64-duroff
tasks:
- name: compile_all_run_unittests_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: compile_benchmarks
distros:
- - rhel62-large
+ - rhel70-large
- name: lint
- name: lint_yaml
- name: .aggfuzzer
@@ -8781,14 +8776,14 @@ buildvariants:
- name: .concurrency !.large !.ubsan !.no_txns
- name: .concurrency .large !.ubsan !.no_txns
distros:
- - rhel62-large
+ - rhel70-large
- name: disk_wiredtiger
- name: .encrypt
- name: idl_tests
- name: initial_sync_fuzzer_gen
- name: .integration
distros:
- - rhel62-large
+ - rhel70-large
- name: .jscore .common
- name: jsCore_minimum_batch_size
- name: jsCore_op_query
@@ -8801,15 +8796,15 @@ buildvariants:
- name: multiversion
- name: .read_write_concern .large
distros:
- - rhel62-large
+ - rhel70-large
- name: .read_write_concern !.large
- name: .replica_sets !.encrypt !.auth
distros:
- - rhel62-large
+ - rhel70-large
- name: retryable_writes_jscore_passthrough_gen
- name: retryable_writes_jscore_stepdown_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: .read_only
- name: .rollbackfuzzer
- name: sasl
@@ -8822,7 +8817,7 @@ buildvariants:
- name: .sharding .common
- name: sharded_multi_stmt_txn_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: sharding_opportunistic_secondary_targeting_gen
- name: snmp
- name: .stitch
@@ -8832,34 +8827,34 @@ buildvariants:
distros:
- ubuntu1604-packer
-- name: enterprise-rhel-62-64-bit-large-txns-format
- display_name: "Enterprise RHEL 6.2 (large transactions format)"
+- name: enterprise-rhel-70-64-bit-large-txns-format
+ display_name: "Enterprise RHEL 7.0 (large transactions format)"
modules:
- enterprise
run_on:
- - rhel62-small
+ - rhel70-small
batchtime: 10080 # 7 days
expansions:
compile_flags: >-
--ssl
- MONGO_DISTMOD=rhel62
+ MONGO_DISTMOD=rhel70
-j$(grep -c ^processor /proc/cpuinfo)
--release
--variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- multiversion_platform: rhel62
+ multiversion_platform: rhel70
multiversion_edition: enterprise
repo_edition: enterprise
scons_cache_scope: shared
tooltags: "ssl sasl gssapi"
build_mongoreplay: true
- large_distro_name: rhel62-large
+ large_distro_name: rhel70-large
test_flags: >-
--mongodSetParameters="{maxNumberOfTransactionOperationsInSingleOplogEntry: 2}"
--excludeWithAnyTags=exclude_from_large_txns
tasks:
- name: compile_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: auth_gen
- name: auth_audit_gen
- name: causally_consistent_jscore_txns_passthrough
@@ -8894,32 +8889,32 @@ buildvariants:
- name: noPassthrough_gen
- name: replica_sets
distros:
- - rhel62-large
+ - rhel70-large
- name: replica_sets_auth_gen
- name: replica_sets_ese_gen
- name: replica_sets_ese_gcm_gen
- name: replica_sets_jscore_passthrough
- name: replica_sets_initsync_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: replica_sets_initsync_static_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: replica_sets_kill_secondaries_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: replica_sets_multi_stmt_txn_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
distros:
- - rhel62-large
+ - rhel70-large
- name: replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: sharding_gen
- name: sharding_auth_gen
- name: sharding_auth_audit_gen
@@ -8932,15 +8927,15 @@ buildvariants:
- name: sharded_jscore_txns_sharded_collections
- name: sharded_multi_stmt_txn_jscore_passthrough
distros:
- - rhel62-large
-- name: enterprise-rhel-62-64-bit-majority-read-concern-off
- display_name: "Enterprise RHEL 6.2 (majority read concern off)"
+ - rhel70-large
+- name: enterprise-rhel-70-64-bit-majority-read-concern-off
+ display_name: "Enterprise RHEL 7.0 (majority read concern off)"
modules:
- enterprise
run_on:
- - rhel62-small
+ - rhel70-small
batchtime: 10080 # 7 days
- expansions: &enterprise-rhel-62-64-bit-majority-read-concern-off-expansions
+ expansions: &enterprise-rhel-70-64-bit-majority-read-concern-off-expansions
# Ban tests that run prepareTransaction or multi-shard transactions (which use
# prepareTransaction). prepareTransaction is rejected on nodes with
# enableMajorityReadConcern:"false" (SERVER-37559).
@@ -8952,18 +8947,18 @@ buildvariants:
--ssl
--release
--variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- MONGO_DISTMOD=rhel62
- multiversion_platform: rhel62
+ MONGO_DISTMOD=rhel70
+ multiversion_platform: rhel70
multiversion_edition: enterprise
repo_edition: enterprise
scons_cache_scope: shared
tooltags: "ssl sasl gssapi"
build_mongoreplay: true
- large_distro_name: rhel62-large
+ large_distro_name: rhel70-large
tasks:
- name: compile_all_run_unittests_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: .aggregation !.read_write_concern
- name: audit
- name: .auth !.multiversion
@@ -8981,7 +8976,7 @@ buildvariants:
- name: .encrypt
- name: .integration
distros:
- - rhel62-large
+ - rhel70-large
- name: .jscore .common
- name: jsCore_minimum_batch_size
- name: jsCore_op_query
@@ -8991,10 +8986,10 @@ buildvariants:
- name: multiversion
- name: .read_write_concern .large
distros:
- - rhel62-large
+ - rhel70-large
- name: .replica_sets !.auth !.encrypt !.non_maj_read
distros:
- - rhel62-large
+ - rhel70-large
- name: retryable_writes_jscore_passthrough_gen
- name: .read_only
- name: .rollbackfuzzer
@@ -9012,14 +9007,14 @@ buildvariants:
- name: snmp
- name: .updatefuzzer
-- name: enterprise-rhel-62-64-bit-flow-control-off
- display_name: "Enterprise RHEL 6.2 (flow control off)"
+- name: enterprise-rhel-70-64-bit-flow-control-off
+ display_name: "Enterprise RHEL 7.0 (flow control off)"
modules:
- enterprise
run_on:
- - rhel62-small
+ - rhel70-small
batchtime: 10080 # 7 days
- expansions: &enterprise-rhel-62-64-bit-flow-control-off
+ expansions: &enterprise-rhel-70-64-bit-flow-control-off
test_flags: >-
--flowControl=off
--excludeWithAnyTags=requires_flow_control
@@ -9028,21 +9023,21 @@ buildvariants:
--ssl
--release
--variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- MONGO_DISTMOD=rhel62
- multiversion_platform: rhel62
+ MONGO_DISTMOD=rhel70
+ multiversion_platform: rhel70
multiversion_edition: enterprise
repo_edition: enterprise
scons_cache_scope: shared
tooltags: "ssl sasl gssapi"
build_mongoreplay: true
- large_distro_name: rhel62-large
+ large_distro_name: rhel70-large
tasks:
- name: compile_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: dbtest_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: .aggfuzzer
- name: .aggregation
- name: audit
@@ -9053,13 +9048,13 @@ buildvariants:
- name: .concurrency !.ubsan !.no_txns !.large
- name: .concurrency !.ubsan !.no_txns .large
distros:
- - rhel62-large
+ - rhel70-large
- name: disk_wiredtiger
- name: .encrypt
- name: initial_sync_fuzzer_gen
- name: .integration
distros:
- - rhel62-large
+ - rhel70-large
- name: .jscore .common
- name: jsCore_minimum_batch_size
- name: jsCore_op_query
@@ -9073,10 +9068,10 @@ buildvariants:
- name: multiversion
- name: .read_write_concern !.aggregation
distros:
- - rhel62-large
+ - rhel70-large
- name: .replica_sets !.encrypt !.auth
distros:
- - rhel62-large
+ - rhel70-large
- name: retryable_writes_jscore_passthrough_gen
- name: .read_only
- name: .retry
@@ -9092,18 +9087,18 @@ buildvariants:
- name: snmp
- name: .updatefuzzer
-- name: enterprise-rhel-62-64-bit-coverage
- display_name: "~ Enterprise RHEL 6.2 DEBUG Code Coverage"
+- name: enterprise-rhel-70-64-bit-coverage
+ display_name: "~ Enterprise RHEL 7.0 DEBUG Code Coverage"
modules:
- enterprise
run_on:
- - rhel62-large
+ - rhel70-large
batchtime: 10080 # 7 days
stepback: false
expansions:
test_flags: --excludeWithAnyTags=resource_intensive
- compile_flags: --dbg=on --gcov --ssl MONGO_DISTMOD=rhel62 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- multiversion_platform: rhel62
+ compile_flags: --dbg=on --gcov --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+ multiversion_platform: rhel70
multiversion_edition: enterprise
resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's
# The gcov instrumentation saves the path the .gcno files were created in as the default path
@@ -9340,7 +9335,6 @@ buildvariants:
- name: compile_all_run_unittests_TG
distros:
- rhel62-large
- - name: .aggfuzzer .common
- name: aggregation
- name: .auth !.multiversion !.audit
- name: causally_consistent_jscore_txns_passthrough
@@ -9353,7 +9347,6 @@ buildvariants:
- name: disk_wiredtiger
- name: free_monitoring
- name: .jscore .common
- - name: .jstestfuzz .common
- name: .logical_session_cache
- name: multiversion
- name: replica_sets
@@ -10195,26 +10188,26 @@ buildvariants:
- rhel62-large
- name: jsCore
-- name: enterprise-rhel-62-64-bit-inmem
- display_name: Enterprise RHEL 6.2 (inMemory)
+- name: enterprise-rhel-70-64-bit-inmem
+ display_name: Enterprise RHEL 7.0 (inMemory)
modules:
- enterprise
run_on:
- - rhel62-small
+ - rhel70-small
batchtime: 10080 # 7 days
- expansions: &enterprise-rhel-62-64-bit-inmem-expansions
+ expansions: &enterprise-rhel-70-64-bit-inmem-expansions
test_flags: --storageEngine=inMemory --excludeWithAnyTags=requires_persistence,requires_journaling
- compile_flags: --ssl MONGO_DISTMOD=rhel62 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- multiversion_platform: rhel62
+ compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+ multiversion_platform: rhel70
multiversion_edition: enterprise
scons_cache_scope: shared
tooltags: "ssl sasl gssapi"
build_mongoreplay: true
- large_distro_name: rhel62-large
+ large_distro_name: rhel70-large
tasks:
- name: compile_all_run_unittests_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: .aggfuzzer .common
- name: .aggregation !.unwind !.encrypt
- name: audit
@@ -10224,10 +10217,10 @@ buildvariants:
- name: .misc_js
- name: .concurrency !.ubsan !.no_txns !.kill_terminate
distros:
- - rhel62-large # Some workloads require a lot of memory, use a bigger machine for this suite.
+ - rhel70-large # Some workloads require a lot of memory, use a bigger machine for this suite.
- name: .integration !.audit
distros:
- - rhel62-large
+ - rhel70-large
- name: .jscore .common !.decimal
- name: jsCore_op_query
- name: jsCore_txns_large_txns_format
@@ -10242,7 +10235,7 @@ buildvariants:
- name: replica_sets_multi_stmt_txn_jscore_passthrough
- name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen
distros:
- - rhel62-large
+ - rhel70-large
- name: .retry
- name: rollback_fuzzer_gen
- name: sasl
@@ -10250,7 +10243,7 @@ buildvariants:
- name: session_jscore_passthrough
- name: sharded_multi_stmt_txn_jscore_passthrough
distros:
- - rhel62-large
+ - rhel70-large
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.mixed_version !.csrs
- name: snmp
@@ -10260,30 +10253,30 @@ buildvariants:
- name: linux-64-ephemeralForTest
display_name: Linux (ephemeralForTest)
run_on:
- - rhel62-small
+ - rhel70-small
batchtime: 10080 # 7 days
expansions:
# Transactions are not explicitly supported on the ephemeralForTest storage engine.
# Speculative majority reads are currently only allowed for change streams, which are only supported on WiredTiger.
test_flags: --storageEngine=ephemeralForTest --excludeWithAnyTags=requires_persistence,requires_fsync,SERVER-21420,SERVER-21658,requires_journaling,requires_wiredtiger,uses_transactions,uses_prepare_transaction,requires_document_locking,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams
compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --dbg=off --opt=on --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
- multiversion_platform: rhel62
+ multiversion_platform: rhel70
multiversion_edition: targeted
scons_cache_scope: shared
tooltags: ""
build_mongoreplay: true
- large_distro_name: rhel62-large
+ large_distro_name: rhel70-large
tasks:
- name: compile_all_run_unittests_TG
distros:
- - rhel62-large
+ - rhel70-large
- name: .aggfuzzer .common
- name: aggregation
- name: .auth !.multiversion !.audit
- name: .misc_js
- name: concurrency
distros:
- - rhel62-large # Some workloads require a lot of memory, use a bigger machine for this suite.
+ - rhel70-large # Some workloads require a lot of memory, use a bigger machine for this suite.
- name: concurrency_replication
- name: concurrency_replication_causal_consistency_gen
- name: concurrency_sharded_replication_gen
@@ -10292,10 +10285,10 @@ buildvariants:
- name: concurrency_simultaneous
- name: concurrency_simultaneous_replication
distros:
- - rhel62-large
+ - rhel70-large
- name: .integration !.audit
distros:
- - rhel62-large
+ - rhel70-large
- name: .jscore .common !.txns !.decimal
- name: jsCore_op_query
- name: .jstestfuzz .common
@@ -10727,7 +10720,7 @@ buildvariants:
jstestfuzz_concurrent_num_files: 10
target_resmoke_time: 10
large_distro_name: rhel62-large
- burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-inmem linux-64-duroff enterprise-rhel-62-64-bit-store-fam-images-in-side-coll
+ burn_in_tag_buildvariants: enterprise-rhel-70-64-bit-majority-read-concern-off enterprise-rhel-70-64-bit-inmem linux-64-duroff enterprise-rhel-70-64-bit-store-fam-images-in-side-coll
tasks:
- name: commit_queue_placeholder
- name: compile_core_tools_TG
diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml
index 2da8108aee7..ea480292e76 100644
--- a/etc/generate_subtasks_config.yml
+++ b/etc/generate_subtasks_config.yml
@@ -9,7 +9,7 @@ build_variant_large_distro_exceptions:
- enterprise-debian92-64
- enterprise-linux-64-amazon-ami
- enterprise-macos
- - enterprise-rhel-62-64-bit-coverage
+ - enterprise-rhel-70-64-bit-coverage
- enterprise-rhel-67-s390x
- enterprise-rhel-70-64-bit
- enterprise-rhel-70-64-bit-no-libunwind