diff options
author | Trevor Guidry <trevor.guidry@mongodb.com> | 2023-01-31 16:15:24 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-01-31 17:52:50 +0000 |
commit | 65ebb1aab6324414d92fdc5a518a7940b09d8831 (patch) | |
tree | 28f02f7ae6feb11e3063a6ac95d22ca7bd7f795c | |
parent | b2be7ca875c4741e3baa013b6516a7272b8defc2 (diff) | |
download | mongo-65ebb1aab6324414d92fdc5a518a7940b09d8831.tar.gz |
SERVER-70344 aggregate several replica sets suites
21 files changed, 172 insertions, 113 deletions
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese.yml new file mode 100644 index 00000000000..b0f7386b6c5 --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese.yml @@ -0,0 +1,7 @@ +- suite_name: replica_sets_ese + base_suite: replica_sets + overrides: + - "encryption.testdata_ese" + excludes: + - "encryption.excluded_files" + - "encryption.serverless_excluded_files" diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese_gcm.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese_gcm.yml new file mode 100644 index 00000000000..78a7c6c6b57 --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_ese_gcm.yml @@ -0,0 +1,8 @@ +- suite_name: replica_sets_ese_gcm + base_suite: replica_sets + overrides: + - "encryption.testdata_ese" + - "encryption.testdata_gcm" + excludes: + - "encryption.excluded_files" + - "encryption.serverless_excluded_files" diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_large_txns_format.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_large_txns_format.yml new file mode 100644 index 00000000000..d63bdc5afa5 --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_large_txns_format.yml @@ -0,0 +1,9 @@ +- suite_name: replica_sets_large_txns_format + base_suite: replica_sets + overrides: + - "large_txns_format.enable" + - "archive.tests" + - "replica_sets.non_enterprise_root" + excludes: + - "large_txns_format.excluded_files" + - "large_txns_format.replica_sets_excluded_files" diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring.yml new file mode 100644 index 00000000000..40177c7a2d4 --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring.yml @@ -0,0 +1,5 @@ +- suite_name: replica_sets_max_mirroring + base_suite: replica_sets + overrides: + - "max_mirroring.enable" + - "replica_sets.non_enterprise_root" diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format.yml new file mode 100644 index 00000000000..f25fa1f9e88 --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format.yml @@ -0,0 +1,14 @@ +- suite_name: replica_sets_max_mirroring_large_txns_format + base_suite: replica_sets + description: >- + This suite is a combination of replica_sets_max_mirroring and + replica_sets_large_txns_format. You can run any of these tests individually to + debug any issues that might arrise. + overrides: + - "max_mirroring.enable" + - "large_txns_format.enable" + - "archive.tests" + - "replica_sets.non_enterprise_root" + excludes: + - "large_txns_format.excluded_files" + - "large_txns_format.replica_sets_excluded_files" diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese.yml new file mode 100644 index 00000000000..ab9c27cf3bd --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese.yml @@ -0,0 +1,16 @@ +- suite_name: replica_sets_max_mirroring_large_txns_format_ese + base_suite: replica_sets + description: >- + This suite is a combination of replica_sets_max_mirroring, replica_sets_ese, and + replica_sets_large_txns_format. You can run any of these tests individually to + debug any issues that might arrise. + overrides: + - "max_mirroring.enable" + - "large_txns_format.enable" + - "encryption.testdata_ese" + - "archive.tests" + excludes: + - "encryption.excluded_files" + - "encryption.serverless_excluded_files" + - "large_txns_format.excluded_files" + - "large_txns_format.replica_sets_excluded_files" diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese_gcm.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese_gcm.yml new file mode 100644 index 00000000000..9f837d248fb --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/replica_sets_max_mirroring_large_txns_format_ese_gcm.yml @@ -0,0 +1,17 @@ +- suite_name: replica_sets_max_mirroring_large_txns_format_ese_gcm + base_suite: replica_sets + description: >- + This suite is a combination of replica_sets_max_mirroring, replica_sets_ese_gcm, and + replica_sets_large_txns_format. You can run any of these tests individually to + debug any issues that might arrise. + overrides: + - "max_mirroring.enable" + - "large_txns_format.enable" + - "encryption.testdata_ese" + - "encryption.testdata_gcm" + - "archive.tests" + excludes: + - "encryption.excluded_files" + - "encryption.serverless_excluded_files" + - "large_txns_format.excluded_files" + - "large_txns_format.replica_sets_excluded_files" diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml new file mode 100644 index 00000000000..7609fb306a9 --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/archive.yml @@ -0,0 +1,5 @@ +- name: tests + value: + executor: + archive: + tests: true diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml index 9c1011c7513..da5a5d93582 100644 --- a/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/encryption.yml @@ -1,4 +1,23 @@ ### Overrides for some suites with encryption ### +- name: testdata_ese + value: + executor: + config: + shell_options: + global_vars: + TestData: + enableEncryption: '' + encryptionKeyFile: 'src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2' + +- name: testdata_gcm + value: + executor: + config: + shell_options: + global_vars: + TestData: + encryptionCipherMode: 'AES256-GCM' + - name: mongodfixture_ese value: executor: @@ -18,3 +37,9 @@ value: exclude_with_any_tags: - does_not_support_encrypted_storage_engine + +# Shard merge protocol won't work with encrypted storage engines. +- name: serverless_excluded_files + value: + exclude_with_any_tags: + - serverless diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/large_txns_format.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/large_txns_format.yml new file mode 100644 index 00000000000..f64a82ac4ba --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/large_txns_format.yml @@ -0,0 +1,21 @@ +### Overrides for matrix suites that include large_txns_format ### +- name: enable + value: + executor: + config: + shell_options: + global_vars: + TestData: + setParameters: + maxNumberOfTransactionOperationsInSingleOplogEntry: 1 + +- name: excluded_files + value: + exclude_with_any_tags: + # Transactions are not allowed to operate on capped collections. + - requires_capped + +- name: replica_sets_excluded_files + value: + exclude_files: + - jstests/replsets/tenant_migration_recipient_shard_merge_copies_change_collections.js diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml new file mode 100644 index 00000000000..a46fa12583e --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/max_mirroring.yml @@ -0,0 +1,10 @@ +### Overrides for matrix suites that include max_mirroring ### +- name: enable + value: + executor: + config: + shell_options: + global_vars: + TestData: + setParameters: + mirrorReads: "{samplingRate: 1.0}" diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets.yml new file mode 100644 index 00000000000..89f42071aa5 --- /dev/null +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets.yml @@ -0,0 +1,5 @@ +- name: non_enterprise_root + value: + selector: + roots: + - jstests/replsets/*.js diff --git a/buildscripts/resmokeconfig/suites/replica_sets_ese.yml b/buildscripts/resmokeconfig/suites/replica_sets_ese.yml deleted file mode 100644 index cec83f33cc6..00000000000 --- a/buildscripts/resmokeconfig/suites/replica_sets_ese.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Section that is ignored by resmoke.py. -config_variables: -- &keyFile src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2 - -test_kind: js_test - -selector: - roots: - - jstests/replsets/*.js - - src/mongo/db/modules/enterprise/jstests/fcbis/*.js - exclude_with_any_tags: - - does_not_support_encrypted_storage_engine - # Shard merge protocol won't work with encrypted storage engines. - - serverless -executor: - config: - shell_options: - nodb: '' - global_vars: - TestData: - enableEncryption: '' - encryptionKeyFile: *keyFile diff --git a/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml b/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml deleted file mode 100644 index 5ad50811b58..00000000000 --- a/buildscripts/resmokeconfig/suites/replica_sets_ese_gcm.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Section that is ignored by resmoke.py. -config_variables: -- &keyFile src/mongo/db/modules/enterprise/jstests/encryptdb/libs/ekf2 - -test_kind: js_test - -selector: - roots: - - jstests/replsets/*.js - - src/mongo/db/modules/enterprise/jstests/fcbis/*.js - exclude_with_any_tags: - - does_not_support_encrypted_storage_engine - # Shard merge protocol won't work with encrypted storage engines. - - serverless -executor: - config: - shell_options: - nodb: '' - global_vars: - TestData: - enableEncryption: '' - encryptionKeyFile: *keyFile - encryptionCipherMode: 'AES256-GCM' diff --git a/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml deleted file mode 100644 index adb47962994..00000000000 --- a/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml +++ /dev/null @@ -1,21 +0,0 @@ -test_kind: js_test - -selector: - roots: - - jstests/replsets/*.js - exclude_with_any_tags: - # Transactions are not allowed to operate on capped collections. - - requires_capped - exclude_files: - - jstests/replsets/tenant_migration_recipient_shard_merge_copies_change_collections.js - -executor: - archive: - tests: true - config: - shell_options: - nodb: '' - global_vars: - TestData: - setParameters: - maxNumberOfTransactionOperationsInSingleOplogEntry: 1 diff --git a/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml b/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml deleted file mode 100644 index a871411297b..00000000000 --- a/buildscripts/resmokeconfig/suites/replica_sets_max_mirroring.yml +++ /dev/null @@ -1,15 +0,0 @@ -test_kind: js_test - -selector: - roots: - - jstests/replsets/*.js - exclude_files: - -executor: - config: - shell_options: - nodb: '' - global_vars: - TestData: - setParameters: - mirrorReads: "{samplingRate: 1.0}" diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 84de2f2028f..31dcb865d7f 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -337,6 +337,7 @@ buildvariants: - name: replica_sets_jscore_passthrough_gen - name: replica_sets_reconfig_jscore_passthrough_gen - name: replica_sets_reconfig_jscore_stepdown_passthrough_gen + - name: replica_sets_max_mirroring_large_txns_format_gen - name: .retry - name: .read_only - name: session_jscore_passthrough @@ -835,6 +836,7 @@ buildvariants: - name: .replica_sets .large !.fcbis distros: - windows-vsCurrent-large + - name: replica_sets_max_mirroring_large_txns_format_gen - name: .resharding_fuzzer - name: retryable_writes_jscore_passthrough_gen - name: retryable_writes_jscore_stepdown_passthrough_gen @@ -897,11 +899,10 @@ buildvariants: - name: noPassthrough_gen - name: noPassthroughWithMongod_gen - name: .replica_sets .common !.ignore_non_generated_replica_sets_jscore_passthrough - - name: .replica_sets .multi_oplog !.ignore_non_generated_replica_sets_jscore_passthrough + - name: .replica_sets .multi_oplog !.ignore_non_generated_replica_sets_jscore_passthrough !.gcm - name: replica_sets_jscore_passthrough_gen distros: - windows-vsCurrent-large - - name: replica_sets_ese_gen - name: sasl - name: .sharding .txns - name: sharding_auth_gen @@ -967,9 +968,8 @@ buildvariants: - name: noPassthrough_gen - name: noPassthroughWithMongod_gen - name: .replica_sets .common !.ignore_non_generated_replica_sets_jscore_passthrough - - name: .replica_sets .multi_oplog !.ignore_non_generated_replica_sets_jscore_passthrough + - name: .replica_sets .multi_oplog !.ignore_non_generated_replica_sets_jscore_passthrough !.gcm - name: replica_sets_jscore_passthrough_gen - - name: replica_sets_ese_gen - name: sasl - name: .sharding .txns - name: sharding_auth_gen @@ -1125,7 +1125,7 @@ buildvariants: - name: jsCore_txns_large_txns_format - name: mongosTest - name: replica_sets_gen - - name: replica_sets_large_txns_format_gen + - name: replica_sets_max_mirroring_large_txns_format_gen - name: .ssl - name: .stitch - name: unittest_shell_hang_analyzer_gen @@ -1794,6 +1794,7 @@ buildvariants: - name: .replica_sets !.multi_oplog .large distros: - rhel80-medium + - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .rollbackfuzzer - name: .sharding .txns @@ -1918,7 +1919,8 @@ buildvariants: - name: libunwind_tests - name: replica_sets_auth_gen - name: replica_sets_jscore_passthrough - - name: .replica_sets .multi_oplog + - name: .replica_sets .multi_oplog !.encrypt + - name: replica_sets_max_mirroring_large_txns_format_gen - name: sasl - name: search - name: search_auth @@ -2081,7 +2083,8 @@ buildvariants: - name: .logical_session_cache .one_sec - name: replica_sets_auth_gen - name: replica_sets_jscore_passthrough - - name: .replica_sets .multi_oplog + - name: .replica_sets .multi_oplog !.encrypt + - name: replica_sets_max_mirroring_large_txns_format_gen - name: sasl - name: search - name: search_auth @@ -2374,9 +2377,9 @@ buildvariants: - name: .multi_shard .common - name: .query_fuzzer - name: .read_write_concern - - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough - name: .replica_sets !.multi_oplog + - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .retry - name: .read_only @@ -2457,9 +2460,9 @@ buildvariants: - name: .multi_shard .common - name: .query_fuzzer - name: .read_write_concern - - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough - name: .replica_sets !.multi_oplog + - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .retry - name: .read_only @@ -2546,9 +2549,9 @@ buildvariants: - name: .logical_session_cache .one_sec - name: .multi_shard .common - name: .read_write_concern - - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough - name: .replica_sets !.multi_oplog + - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .retry - name: .rollbackfuzzer @@ -2625,9 +2628,9 @@ buildvariants: - name: .logical_session_cache .one_sec - name: .multi_shard .common - name: .read_write_concern - - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough - name: .replica_sets !.multi_oplog + - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .retry - name: .rollbackfuzzer diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 5690114bf86..9a19693cdc0 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -6250,40 +6250,34 @@ tasks: - func: "generate resmoke tasks" - <<: *gen_task_template - name: replica_sets_ese_gen - tags: ["replica_sets", "encrypt", "san", "no_debug_mode"] + name: replica_sets_max_mirroring_large_txns_format_gen + tags: [] commands: - func: "generate resmoke tasks" - vars: - use_large_distro: "true" - <<: *gen_task_template - name: replica_sets_ese_gcm_gen - tags: ["replica_sets", "encrypt", "san", "gcm", "no_debug_mode"] + name: replica_sets_max_mirroring_large_txns_format_ese_gen + tags: ["replica_sets", "encrypt", "san", "no_debug_mode", "multi_oplog"] commands: - func: "generate resmoke tasks" vars: use_large_distro: "true" - <<: *gen_task_template - name: replica_sets_auth_gen - tags: ["replica_sets", "common", "san", "auth", "no_debug_mode"] + name: replica_sets_max_mirroring_large_txns_format_ese_gcm_gen + tags: ["replica_sets", "encrypt", "san", "gcm", "no_debug_mode", "multi_oplog"] commands: - func: "generate resmoke tasks" vars: use_large_distro: "true" - <<: *gen_task_template - name: replica_sets_large_txns_format_gen - tags: ["replica_sets", "multi_oplog", "san"] - commands: - - func: "generate resmoke tasks" - -- <<: *gen_task_template - name: replica_sets_max_mirroring_gen - tags: ["replica_sets", "san"] + name: replica_sets_auth_gen + tags: ["replica_sets", "common", "san", "auth", "no_debug_mode"] commands: - func: "generate resmoke tasks" + vars: + use_large_distro: "true" - <<: *gen_task_template name: replica_sets_multiversion_gen diff --git a/etc/evergreen_yml_components/variants/in_memory.yml b/etc/evergreen_yml_components/variants/in_memory.yml index e5ec4d6d957..56ab083b1d4 100644 --- a/etc/evergreen_yml_components/variants/in_memory.yml +++ b/etc/evergreen_yml_components/variants/in_memory.yml @@ -53,7 +53,8 @@ buildvariants: - name: .read_write_concern !.durable_history - name: replica_sets_gen - name: .replica_sets .common - - name: .replica_sets .multi_oplog + - name: .replica_sets .multi_oplog !.encrypt + - name: replica_sets_max_mirroring_large_txns_format_gen - name: replica_sets_multi_stmt_txn_jscore_passthrough - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen distros: diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml index 67a4f102c1e..e919b6762be 100644 --- a/etc/evergreen_yml_components/variants/misc_release.yml +++ b/etc/evergreen_yml_components/variants/misc_release.yml @@ -2443,7 +2443,7 @@ buildvariants: - name: .read_write_concern !.linearize - name: replica_sets_gen - name: replica_sets_kill_secondaries_jscore_passthrough - - name: replica_sets_large_txns_format_gen + - name: replica_sets_max_mirroring_large_txns_format_gen - name: .replica_sets .common !.auth - name: retryable_writes_jscore_passthrough_gen - name: .rollbackfuzzer @@ -2497,7 +2497,7 @@ buildvariants: - name: .read_write_concern !.linearize - name: replica_sets_gen - name: replica_sets_kill_secondaries_jscore_passthrough - - name: replica_sets_large_txns_format_gen + - name: replica_sets_max_mirroring_large_txns_format_gen - name: .replica_sets .common !.auth - name: retryable_writes_jscore_passthrough_gen - name: .rollbackfuzzer diff --git a/etc/evergreen_yml_components/variants/sanitizer.yml b/etc/evergreen_yml_components/variants/sanitizer.yml index 871a538a420..c79880181c9 100644 --- a/etc/evergreen_yml_components/variants/sanitizer.yml +++ b/etc/evergreen_yml_components/variants/sanitizer.yml @@ -102,9 +102,9 @@ buildvariants: - name: .query_fuzzer - name: .random_multiversion_ds - name: .read_write_concern - - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough - name: .replica_sets !.multi_oplog + - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .retry - name: .read_only @@ -182,9 +182,9 @@ buildvariants: - name: .multiversion_passthrough - name: .random_multiversion_ds - name: .read_write_concern - - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough - name: .replica_sets !.multi_oplog + - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .retry - name: .rollbackfuzzer |