diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/evergreen.yml | 91 | ||||
| -rw-r--r-- | etc/evergreen_timeouts.yml | 6 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 32 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/project_and_distro_settings.yml | 4 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/variants/compile_static_analysis.yml | 4 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/variants/ibm.yml | 18 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/variants/misc_release.yml | 8 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/variants/ninja.yml | 2 | ||||
| -rw-r--r-- | etc/generate_subtasks_config.yml | 2 | ||||
| -rwxr-xr-x | etc/system_perf.yml | 22 | ||||
| -rw-r--r-- | etc/third_party_components.yml | 2 |
11 files changed, 121 insertions, 70 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 4a3afa7e8dd..ecf4e195df9 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -71,7 +71,6 @@ variables: # Common compile variant dependency specifications. - &linux_x86_dynamic_compile_variant_dependency - activate: false depends_on: - name: archive_dist_test variant: &linux_x86_dynamic_compile_variant_name linux-x86-dynamic-compile-required @@ -79,7 +78,6 @@ variables: variant: generate-tasks-for-version - &linux_x86_dynamic_debug_compile_variant_dependency - activate: false depends_on: - name: archive_dist_test variant: &linux_x86_dynamic_debug_compile_variant_name linux-x86-dynamic-debug-compile-required @@ -87,7 +85,6 @@ variables: variant: generate-tasks-for-version - &linux_debug_aubsan_compile_variant_dependency - activate: false depends_on: - name: archive_dist_test variant: &linux_debug_aubsan_compile_variant_name linux-debug-aubsan-compile-required @@ -95,7 +92,6 @@ variables: variant: generate-tasks-for-version - &windows_compile_variant_dependency - activate: false depends_on: - name: archive_dist_test variant: &windows_compile_variant_name windows-compile-required @@ -279,7 +275,6 @@ buildvariants: name: &linux-64-debug-required linux-64-debug-required display_name: "! Linux x86 Shared Library DEBUG" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter - activate: false run_on: - rhel80-medium expansions: @@ -906,10 +901,10 @@ buildvariants: - name: server_discovery_and_monitoring_json_test_TG - name: server_selection_json_test_TG -- &enterprise-windows-required-template +- &enterprise-windows-template <<: *windows_compile_variant_dependency - name: &enterprise-windows-required enterprise-windows-required - display_name: "! Enterprise Windows" + name: &enterprise-windows enterprise-windows + display_name: "* Enterprise Windows" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter modules: - enterprise @@ -917,7 +912,7 @@ buildvariants: - windows-vsCurrent-small expansions: &windows_required_expansions compile_variant: *windows_compile_variant_name - burn_in_tests_build_variant: enterprise-windows-required + burn_in_tests_build_variant: enterprise-windows-all-feature-flags-required exe: ".exe" content_type: application/zip python: '/cygdrive/c/python/python37/python.exe' @@ -938,7 +933,6 @@ buildvariants: - name: burn_in_tests_gen - name: audit - name: auth_audit_gen - - name: buildscripts_test - name: causally_consistent_jscore_txns_passthrough distros: - windows-vsCurrent-large @@ -967,16 +961,14 @@ buildvariants: - name: sharding_auth_gen - name: sharding_auth_audit_gen - name: sharding_ese_gen - - name: sharding_opportunistic_secondary_targeting_gen - - name: unittest_shell_hang_analyzer_gen -- <<: *enterprise-windows-required-template +- <<: *enterprise-windows-template name: &enterprise-windows-all-feature-flags-required enterprise-windows-all-feature-flags-required display_name: "! Enterprise Windows (all feature flags)" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter expansions: <<: *windows_required_expansions - burn_in_tests_build_variant: enterprise-windows-required + burn_in_tests_build_variant: enterprise-windows-all-feature-flags-required exe: ".exe" content_type: application/zip python: '/cygdrive/c/python/python37/python.exe' @@ -1004,6 +996,7 @@ buildvariants: - name: burn_in_tests_gen - name: audit - name: auth_audit_gen + - name: buildscripts_test - name: causally_consistent_jscore_txns_passthrough distros: - windows-vsCurrent-large @@ -1031,6 +1024,8 @@ buildvariants: - name: sharding_auth_gen - name: sharding_auth_audit_gen - name: sharding_ese_gen + - name: sharding_opportunistic_secondary_targeting_gen + - name: unittest_shell_hang_analyzer_gen - name: &enterprise-windows-cxx20-debug-experimental enterprise-windows-cxx20-debug-experimental display_name: "~ Enterprise Windows C++20 DEBUG" @@ -1350,16 +1345,16 @@ buildvariants: # Redhat buildvariants # ########################################### -- &enterprise-rhel-80-64-bit-dynamic-required-template +- &enterprise-rhel-80-64-bit-dynamic-template <<: *linux_x86_dynamic_compile_variant_dependency - name: &enterprise-rhel-80-64-bit-dynamic-required enterprise-rhel-80-64-bit-dynamic-required - display_name: "! Shared Library Enterprise RHEL 8.0" + name: &enterprise-rhel-80-64-bit-dynamic enterprise-rhel-80-64-bit-dynamic + display_name: "* Shared Library Enterprise RHEL 8.0" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter modules: - enterprise run_on: - rhel80-small - expansions: &enterprise-rhel-80-64-bit-dynamic-required-expansions + expansions: &enterprise-rhel-80-64-bit-dynamic-expansions <<: *linux_x86_generic_expansions scons_cache_scope: shared scons_cache_mode: all @@ -1384,18 +1379,11 @@ buildvariants: - name: version_burn_in_gen variant: generate-tasks-for-version tasks: - - name: lint_fuzzer_sanity_patch - - name: test_api_version_compatibility - name: burn_in_tests_gen - - name: check_feature_flag_tags - - name: check_for_todos - name: .aggfuzzer !.feature_flag_guarded - name: .aggregation !.feature_flag_guarded - name: audit - name: .auth - - name: burn_in_tags_gen - - name: buildscripts_test - - name: resmoke_end2end_tests - name: unittest_shell_hang_analyzer_gen - name: .causally_consistent !.sharding - name: .change_streams @@ -1405,17 +1393,6 @@ buildvariants: - name: .concurrency .large !.ubsan !.no_txns !.debug_only distros: - rhel80-medium - - name: config_fuzzer_concurrency - - name: config_fuzzer_simulate_crash_concurrency_replication - distros: - - rhel80-large - - name: config_fuzzer_concurrency_replication - distros: - - rhel80-large - - name: config_fuzzer_jsCore - - name: config_fuzzer_replica_sets_jscore_passthrough - distros: - - rhel80-large - name: disk_wiredtiger - name: .encrypt - name: idl_tests @@ -1429,7 +1406,6 @@ buildvariants: - name: json_schema - name: .jstestfuzz !.flow_control # Flow control jstestfuzz take longer. - name: libunwind_tests - - name: .multiversion_sanity_check - name: mqlrun - name: .multi_shard - name: multi_stmt_txn_jscore_passthrough_with_migration_gen @@ -1466,20 +1442,19 @@ buildvariants: - name: sharding_api_version_jscore_passthrough_gen - name: .sharding .txns - name: .sharding .common - - name: sharding_opportunistic_secondary_targeting_gen - name: .updatefuzzer - name: secondary_reads_passthrough_gen - name: .serverless distros: - rhel80-xlarge -- <<: *enterprise-rhel-80-64-bit-dynamic-required-template +- <<: *enterprise-rhel-80-64-bit-dynamic-template name: &enterprise-rhel-80-64-bit-dynamic-debug-mode enterprise-rhel-80-64-bit-dynamic-debug-mode display_name: "Shared Library Enterprise RHEL 8.0 Debug Mode" cron: "0 4 * * 0" # Run once a week on sunday at 4am stepback: false expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-required-expansions + <<: *enterprise-rhel-80-64-bit-dynamic-expansions compile_variant: *enterprise-rhel-80-64-bit-dynamic-debug-mode compile_flags: >- --ssl @@ -1597,7 +1572,7 @@ buildvariants: - rhel80-small stepback: false expansions: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions - <<: *enterprise-rhel-80-64-bit-dynamic-required-expansions + <<: *enterprise-rhel-80-64-bit-dynamic-expansions # To force disable feature flags even on the all feature flags variant, please use this file: # buildscripts/resmokeconfig/fully_disabled_feature_flags.yml test_flags: >- @@ -1610,12 +1585,19 @@ buildvariants: - name: cqf_parallel - name: query_golden_classic - name: query_golden_cqf + - name: lint_fuzzer_sanity_patch + - name: test_api_version_compatibility - name: burn_in_tests_gen + - name: check_feature_flag_tags + - name: check_for_todos - name: .aggfuzzer - name: .aggregation - name: aggregation_repeat_queries - name: audit - name: .auth + - name: burn_in_tags_gen + - name: buildscripts_test + - name: resmoke_end2end_tests - name: unittest_shell_hang_analyzer_gen - name: .causally_consistent !.sharding - name: .change_streams @@ -1630,6 +1612,17 @@ buildvariants: - name: .concurrency .large !.ubsan !.no_txns !.debug_only distros: - rhel80-medium + - name: config_fuzzer_concurrency + - name: config_fuzzer_simulate_crash_concurrency_replication + distros: + - rhel80-large + - name: config_fuzzer_concurrency_replication + distros: + - rhel80-large + - name: config_fuzzer_jsCore + - name: config_fuzzer_replica_sets_jscore_passthrough + distros: + - rhel80-large - name: disk_wiredtiger - name: .encrypt - name: feature_flag_multiversion_gen @@ -1643,6 +1636,7 @@ buildvariants: - name: json_schema - name: .jstestfuzz !.flow_control # Flow control jstestfuzz take longer. - name: libunwind_tests + - name: .multiversion_sanity_check - name: mqlrun - name: .multi_shard - name: multi_stmt_txn_jscore_passthrough_with_migration_gen @@ -1682,6 +1676,7 @@ buildvariants: - name: .sharding .common - name: sharded_multi_stmt_txn_jscore_passthrough - name: .serverless + - name: sharding_opportunistic_secondary_targeting_gen - name: .updatefuzzer - name: secondary_reads_passthrough_gen - name: .shard_split @@ -1698,7 +1693,7 @@ buildvariants: - rhel80-small stepback: false expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-required-expansions + <<: *enterprise-rhel-80-64-bit-dynamic-expansions jstestfuzz_num_generated_files: 40 jstestfuzz_concurrent_num_files: 10 target_resmoke_time: 10 @@ -2580,10 +2575,10 @@ buildvariants: - name: server_discovery_and_monitoring_json_test_TG - name: server_selection_json_test_TG -- &rhel80-debug-aubsan-lite-required-template +- &rhel80-debug-aubsan-lite-template <<: *linux_debug_aubsan_compile_variant_dependency - name: &rhel80-debug-aubsan-lite-required rhel80-debug-aubsan-lite-required - display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG" + name: &rhel80-debug-aubsan-lite rhel80-debug-aubsan-lite + display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter modules: - enterprise @@ -2609,7 +2604,7 @@ buildvariants: - name: jsCore - name: jsCore_txns -- <<: *rhel80-debug-aubsan-lite-required-template +- <<: *rhel80-debug-aubsan-lite-template name: &rhel80-debug-aubsan-lite-all-feature-flags-required rhel80-debug-aubsan-lite-all-feature-flags-required display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG (all feature flags)" cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter @@ -3207,7 +3202,7 @@ buildvariants: tasks: - name: win_shared_scons_cache_pruning -- <<: *enterprise-rhel-80-64-bit-dynamic-required-template +- <<: *enterprise-rhel-80-64-bit-dynamic-template name: &commit-queue commit-queue display_name: "~ Commit Queue" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter @@ -3277,7 +3272,7 @@ buildvariants: display_name: "~ Shared Library Enterprise RHEL 8.0 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-required-expansions + <<: *enterprise-rhel-80-64-bit-dynamic-expansions jstestfuzz_num_generated_files: 20 jstestfuzz_concurrent_num_files: 5 target_resmoke_time: 30 diff --git a/etc/evergreen_timeouts.yml b/etc/evergreen_timeouts.yml index 71bc53d993d..bb14c88c638 100644 --- a/etc/evergreen_timeouts.yml +++ b/etc/evergreen_timeouts.yml @@ -34,7 +34,7 @@ overrides: - task: replica_sets_jscore_passthrough exec_timeout: 150 # 2.5 hours. - enterprise-rhel-80-64-bit-dynamic-required: + enterprise-rhel-80-64-bit-dynamic: - task: replica_sets_large_txns_format exec_timeout: 120 # 2 hours. - task: config_fuzzer_replica_sets_jscore_passthrough @@ -52,10 +52,6 @@ overrides: - task: replica_sets_jscore_passthrough exec_timeout: 180 # 3 hours. - enterprise-windows-required: - - task: replica_sets_jscore_passthrough - exec_timeout: 180 # 3 hours. - linux-64-debug: - task: auth exec_timeout: 60 # 1 hour. diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 742673b7580..7d6b4999d30 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -317,7 +317,6 @@ variables: - enterprise-windows - enterprise-windows-debug-unoptimized - enterprise-windows-inmem - - enterprise-windows-required - enterprise-windows-wtdevelop - ubuntu1804-debug-asan - ubuntu1804-debug-ubsan @@ -331,7 +330,7 @@ variables: - enterprise-macos - enterprise-macos-arm64 - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-dynamic-required + - enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required - enterprise-rhel-70-64-bit - enterprise-rhel-82-arm64 - enterprise-rhel-90-64-bit @@ -341,7 +340,6 @@ variables: - enterprise-ubuntu2004-64 - enterprise-ubuntu2204-64 - enterprise-windows - - enterprise-windows-required # List of all variants that use the packages.tgz - package_variants: &package_variants @@ -447,6 +445,14 @@ functions: - *git_get_project - *add_git_tag + "gen feature flags": &gen_feature_flags + command: subprocess.exec + type: test + params: + binary: bash + args: + - "src/evergreen/gen_feature_flags.sh" + "fetch artifacts": &fetch_artifacts command: s3.get params: @@ -2361,12 +2367,7 @@ tasks: display_name: Binaries - *f_expansions_write - - command: subprocess.exec - type: test - params: - binary: bash - args: - - "src/evergreen/gen_feature_flags.sh" + - *gen_feature_flags - *f_expansions_write - command: subprocess.exec @@ -3502,6 +3503,18 @@ tasks: resmoke_jobs_max: 1 - func: "send benchmark results" +- <<: *benchmark_template + name: benchmarks_abt + tags: ["benchmarks"] + commands: + - func: "do benchmark setup" + - func: "run tests" + vars: + suites: benchmarks_abt + exec_timeout_secs: 18000 # 5 hour timeout. + resmoke_jobs_max: 1 + - func: "send benchmark results" + - <<: *run_jepsen_template name: jepsen_register_findAndModify tags: ["jepsen"] @@ -6775,6 +6788,7 @@ tasks: - func: "set up remote credentials" - *f_expansions_write - func: "configure evergreen api credentials" + - *gen_feature_flags - func: "run tests" vars: resmoke_jobs_max: 1 diff --git a/etc/evergreen_yml_components/project_and_distro_settings.yml b/etc/evergreen_yml_components/project_and_distro_settings.yml index 9ef72c4759b..83e3d74b2bf 100644 --- a/etc/evergreen_yml_components/project_and_distro_settings.yml +++ b/etc/evergreen_yml_components/project_and_distro_settings.yml @@ -11,7 +11,7 @@ patch_aliases: variant_tags: [] task_tags: [] - alias: "hourly" - variant: "^(enterprise-rhel-62-64-bit-dynamic-required|enterprise-windows-required|linux-64-debug|ubuntu1804-debug-aubsan-lite|enterprise-rhel-70-64-bit|enterprise-windows|ubuntu1604-debug|macos-debug|windows-debug )$" + variant: "^(enterprise-windows-all-feature-flags-required|linux-64-debug|ubuntu1804-debug-aubsan-lite|enterprise-rhel-70-64-bit|ubuntu1604-debug|macos-debug|windows-debug )$" task: ".*" variant_tags: [] task_tags: [] @@ -21,7 +21,7 @@ patch_aliases: variant_tags: [] task_tags: [] - alias: "required" - variant: "^(.*-required$|enterprise-rhel-62-64-bit-dynamic-required|enterprise-windows-required|linux-64-debug|ubuntu1804-debug-aubsan-lite)$" + variant: "^(.*-required$|linux-64-debug|ubuntu1804-debug-aubsan-lite)$" task: ".*" variant_tags: [] task_tags: [] diff --git a/etc/evergreen_yml_components/variants/compile_static_analysis.yml b/etc/evergreen_yml_components/variants/compile_static_analysis.yml index c824434ae45..47663125854 100644 --- a/etc/evergreen_yml_components/variants/compile_static_analysis.yml +++ b/etc/evergreen_yml_components/variants/compile_static_analysis.yml @@ -144,7 +144,9 @@ buildvariants: scons_cache_scope: shared compile_variant: *windows-compile-required tasks: - - name: compile_and_archive_dist_test_then_package_TG + - name: compile_test_and_package_parallel_core_stream_TG + - name: compile_test_and_package_parallel_unittest_stream_TG + - name: compile_test_and_package_parallel_dbtest_stream_TG - name: compile_build_tools_next_TG - name: server_discovery_and_monitoring_json_test_TG - name: server_selection_json_test_TG diff --git a/etc/evergreen_yml_components/variants/ibm.yml b/etc/evergreen_yml_components/variants/ibm.yml index cdfd1e17d92..d750fae6f73 100644 --- a/etc/evergreen_yml_components/variants/ibm.yml +++ b/etc/evergreen_yml_components/variants/ibm.yml @@ -1,7 +1,8 @@ # IBM build variants. buildvariants: -- name: enterprise-rhel-81-ppc64le +- &enterprise-rhel-81-ppc64le-template + name: enterprise-rhel-81-ppc64le display_name: Enterprise RHEL 8.1 PPC64LE modules: - enterprise @@ -67,6 +68,21 @@ buildvariants: - rhel70-small - name: generate_buildid_to_debug_symbols_mapping +- <<: *enterprise-rhel-81-ppc64le-template + name: enterprise-rhel-81-ppc64le-dynamic + display_name: Enterprise RHEL 8.1 PPC64LE Shared + expansions: + compile_flags: >- + --link-model=dynamic + --ssl + MONGO_DISTMOD=rhel81 + -j$(echo "$(grep -c processor /proc/cpuinfo)/2" | bc) + --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars + tasks: + - name: compile_test_and_package_serial_TG + distros: + - rhel81-power8-large + - name: enterprise-rhel-72-s390x display_name: Enterprise RHEL 7.2 s390x modules: diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml index 59cdda95c69..d63e7b0e9bd 100644 --- a/etc/evergreen_yml_components/variants/misc_release.yml +++ b/etc/evergreen_yml_components/variants/misc_release.yml @@ -534,7 +534,13 @@ buildvariants: scons_cache_scope: shared compile_variant: enterprise-amazon2022-arm64 tasks: - - name: compile_test_and_package_serial_no_unittests_TG + - name: compile_test_and_package_parallel_core_stream_TG + distros: + - amazon2022-arm64-large + - name: compile_test_and_package_parallel_unittest_stream_TG + distros: + - amazon2022-arm64-large + - name: compile_test_and_package_parallel_dbtest_stream_TG distros: - amazon2022-arm64-large - name: test_api_version_compatibility diff --git a/etc/evergreen_yml_components/variants/ninja.yml b/etc/evergreen_yml_components/variants/ninja.yml index 38c58c4bd11..b0d00bc7827 100644 --- a/etc/evergreen_yml_components/variants/ninja.yml +++ b/etc/evergreen_yml_components/variants/ninja.yml @@ -58,7 +58,7 @@ buildvariants: distros: - ubuntu1804-xlarge -- name: enterprise-rhel-80-64-bit-dynamic-required-ninja +- name: enterprise-rhel-80-64-bit-dynamic-ninja display_name: "Ninja Build: Enterprise RHEL 8.0" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. modules: diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml index e84d4a0870c..dcf6baf12eb 100644 --- a/etc/generate_subtasks_config.yml +++ b/etc/generate_subtasks_config.yml @@ -44,7 +44,7 @@ build_variant_large_distro_exceptions: - rhel80-debug-asan - rhel80-debug-asan-all-feature-flags - rhel80-debug-asan-classic-engine - - rhel80-debug-aubsan-lite-required + - rhel80-debug-aubsan-lite - rhel80-debug-suggested - rhel80-debug-ubsan - rhel80-debug-ubsan-all-feature-flags diff --git a/etc/system_perf.yml b/etc/system_perf.yml index b89307e64c8..4c8956cb830 100755 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -836,6 +836,26 @@ tasks: vars: test_control: "bestbuy_query" + - name: bestbuy_4_analytics + priority: 5 + commands: + - func: f_run_dsi_workload + vars: + test_control: "bestbuy_analytics" + test_control_params: | + {scale: 4, + columnstore: False} + + - name: bestbuy_4_analytics_columnstore + priority: 5 + commands: + - func: f_run_dsi_workload + vars: + test_control: "bestbuy_analytics" + test_control_params: | + {scale: 4, + columnstore: True} + - name: tpch_1_normalized priority: 5 commands: @@ -1206,6 +1226,8 @@ buildvariants: - name: bestbuy_agg_merge_different_db - name: bestbuy_agg_merge_same_db - name: bestbuy_agg_merge_wordcount + - name: bestbuy_4_analytics + - name: bestbuy_4_analytics_columnstore - name: bestbuy_query - name: cursor_manager - name: map_reduce_workloads diff --git a/etc/third_party_components.yml b/etc/third_party_components.yml index f5fa9a6e5ee..f719a712f06 100644 --- a/etc/third_party_components.yml +++ b/etc/third_party_components.yml @@ -83,7 +83,7 @@ components: homepage_url: https://github.com/cgoldberg/concurrencytest open_hub_url: https://www.openhub.net/p/concurrencytest release_monitoring_id: -1 - local_directory_path: src/third_party/wiredtiger/test/3rdparty/concurrencytest-0.1.2 + local_directory_path: src/third_party/wiredtiger/test/3rdparty/concurrencytest-0.1.2-locally-modified is_test_only: true team_owner: "Wiredtiger" |