SERVER-58835 remove all feature flag variants in 5.1

2 files changed, 0 insertions, 544 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index eadded6c9fa..9bf5fcb68e8 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -8512,50 +8512,6 @@ buildvariants:
       - windows-vsCurrent-xlarge
   - name: unittest_shell_hang_analyzer_gen
 
-- <<: *enterprise-windows-required-template
-  name: enterprise-windows-all-feature-flags-required
-  display_name: "! Enterprise Windows (all feature flags)"
-  cron: "0 */4 * * *" # Every 4 hours starting at midnight
-  expansions:
-    burn_in_tests_build_variant: enterprise-windows-suggested
-    exe: ".exe"
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi archive-mh archive-mh-debug
-    content_type: application/zip
-    compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5")  --win-version-min=win10
-    num_scons_link_jobs_available: 0.25
-    python: '/cygdrive/c/python/python37/python.exe'
-    ext: zip
-    scons_cache_scope: shared
-    multiversion_platform: windows
-    multiversion_edition: enterprise
-    jstestfuzz_num_generated_files: 35
-    target_resmoke_time: 20
-    max_sub_suites: 5
-    large_distro_name: windows-vsCurrent-large
-    # 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: >-
-        --runAllFeatureFlagTests
-        --excludeWithAnyTags=incompatible_with_windows_tls
-  tasks:
-    - name: compile_and_archive_dist_test_then_package_TG
-      distros:
-        - windows-vsCurrent-xlarge
-    - name: compile_build_tools_next_TG
-      distros:
-        - windows-vsCurrent-xlarge
-    - name: build_variant_gen
-    - name: burn_in_tests_gen
-    - name: noPassthrough_gen
-# Disabling as the following tests are not aware of feature flags.
-#    - name: buildscripts_test
-#    - name: server_discovery_and_monitoring_json_test_TG
-#    - name: server_selection_json_test_TG
-#    - name: compile_run_and_archive_dbtest_TG
-#      distros:
-#        - windows-vsCurrent-xlarge
-#    - name: unittest_shell_hang_analyzer_gen
-
 - &enterprise-windows-suggested-template
   name: enterprise-windows-suggested
   display_name: "* Enterprise Windows"
@@ -8622,70 +8578,6 @@ buildvariants:
     - name: snmp
     - name: unittest_shell_hang_analyzer_gen
 
-- <<: *enterprise-windows-suggested-template
-  name: enterprise-windows-all-feature-flags-suggested
-  display_name: "* Enterprise Windows (all feature flags)"
-  cron: "0 */4 * * *" # Every 4 hours starting at midnight
-  expansions:
-    exe: ".exe"
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi archive-mh archive-mh-debug
-    content_type: application/zip
-    compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10
-    num_scons_link_jobs_available: 0.25
-    python: '/cygdrive/c/python/python37/python.exe'
-    ext: zip
-    scons_cache_scope: shared
-    multiversion_platform: windows
-    multiversion_edition: enterprise
-    jstestfuzz_num_generated_files: 35
-    target_resmoke_time: 20
-    max_sub_suites: 3
-    large_distro_name: windows-vsCurrent-large
-    # 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: >-
-        --runAllFeatureFlagTests
-        --excludeWithAnyTags=incompatible_with_windows_tls
-  tasks:
-    - name: compile_and_archive_dist_test_then_package_TG
-      distros:
-        - windows-vsCurrent-xlarge
-    - name: build_variant_gen
-    - name: audit
-    - name: auth_audit_gen
-    - name: causally_consistent_jscore_txns_passthrough
-      distros:
-        - windows-vsCurrent-large
-    - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore
-    - name: external_auth
-    - name: external_auth_aws
-    - name: external_auth_windows
-      distros:
-        - windows-2016-dc
-    - name: .jscore .common !.sharding
-    - name: jsCore_auth
-    - name: jsCore_ese
-    - name: jsCore_txns_large_txns_format
-    - name: .jstestfuzz .common
-    - name: mqlrun
-    - 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_jscore_passthrough_gen
-    - name: replica_sets_ese_gen
-    - name: sasl
-    - name: .sharding .txns
-    - name: sharding_auth_gen
-    - name: sharding_auth_audit_gen
-    - name: sharding_ese_gen
-    - name: snmp
-# Disabling as the following tests are not aware of feature flags.
-#    - name: buildscripts_test
-#    - name: unittest_shell_hang_analyzer_gen
-#    - name: server_selection_json_test_TG
-#    - name: server_discovery_and_monitoring_json_test_TG
-
 - <<: *enterprise-windows-nopush-template
   name: enterprise-windows-benchmarks
   display_name: "~ Enterprise Windows (Benchmarks)"
@@ -9390,127 +9282,6 @@ buildvariants:
     distros:
       - rhel80-xlarge
 
-- &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)"
-  cron: "0 */4 * * *" # Every 4 hours starting at midnight
-  stepback: false
-  modules:
-  - enterprise
-  run_on:
-  - rhel80-small
-  expansions: &enterprise-rhel-80-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
-    multiversion_platform: rhel80
-    multiversion_edition: enterprise
-    has_packages: false
-    scons_cache_scope: shared
-    scons_cache_mode: all
-    jstestfuzz_num_generated_files: 40
-    jstestfuzz_concurrent_num_files: 10
-    target_resmoke_time: 10
-    max_sub_suites: 5
-    large_distro_name: rhel80-medium
-    num_scons_link_jobs_available: 0.99
-    # 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: >-
-      --runAllFeatureFlagTests
-  tasks: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-tasks
-  - name: compile_test_and_package_parallel_core_stream_TG
-    distros:
-      - rhel80-large
-# Disabling as the following tests are not aware of feature flags.
-#  - name: compile_test_and_package_parallel_unittest_stream_TG
-#    distros:
-#      - rhel80-large
-#  - name: compile_test_and_package_parallel_dbtest_stream_TG
-#    distros:
-#    - rhel80-medium
-  - name: libdeps_graph_linting_TG
-    distros:
-      - rhel80-large
-  - name: build_variant_gen
-  - name: burn_in_tests_gen
-  - name: .aggfuzzer
-  - name: .aggregation
-  - name: audit
-  - name: .auth
-  - name: unittest_shell_hang_analyzer_gen
-  - name: .causally_consistent !.sharding
-  - name: .change_streams
-  - name: .change_stream_fuzzer
-  - name: .misc_js
-  - name: .concurrency !.large !.ubsan !.no_txns !.debug_only
-  - name: .concurrency .large !.ubsan !.no_txns !.debug_only
-    distros:
-    - rhel80-medium
-  - name: disk_wiredtiger
-  - name: .encrypt
-  - name: feature_flag_multiversion_gen
-  - name: idl_tests
-  - name: initial_sync_fuzzer_gen
-  - name: .integration
-    distros:
-    - rhel80-medium
-  - name: .jscore .common
-  - name: jsCore_minimum_batch_size
-  - name: jsCore_txns_large_txns_format
-  - name: jsonSchema
-  - name: .jstestfuzz !.flow_control  # Flow control jstestfuzz take longer.
-  - name: libunwind_tests
-  - name: mqlrun
-  - name: .multi_shard
-  - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
-  - name: multiversion_gen
-  - name: powercycle_smoke
-  - name: .query_fuzzer
-  - name: .random_multiversion_ds
-  - name: .read_write_concern .large
-    distros:
-    - rhel80-medium
-  - name: .read_write_concern !.large
-  - name: .replica_sets !.encrypt !.auth
-    distros:
-    - rhel80-medium
-  - name: replica_sets_api_version_jscore_passthrough_gen
-  - name: replica_sets_reconfig_jscore_passthrough_gen
-  - name: replica_sets_reconfig_jscore_stepdown_passthrough_gen
-    distros:
-    - rhel80-medium
-  - name: replica_sets_reconfig_kill_primary_jscore_passthrough_gen
-    distros:
-    - rhel80-medium
-  - name: retryable_writes_jscore_passthrough_gen
-  - name: retryable_writes_jscore_stepdown_passthrough_gen
-    distros:
-    - rhel80-medium
-  - name: .read_only
-  - name: .rollbackfuzzer
-  - name: sasl
-  - name: search
-  - name: search_auth
-  - name: search_ssl
-  - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
-  - name: sharding_api_version_jscore_passthrough_gen
-  - name: .sharding .txns
-  - name: .sharding .common
-  - name: sharded_multi_stmt_txn_jscore_passthrough
-  - name: snmp
-  - name: .stitch
-  - name: .tenant_migration
-  - name: .updatefuzzer
-  - name: secondary_reads_passthrough_gen
-# Disabling as the following tests are not aware of feature flags.
-#  - name: server_discovery_and_monitoring_json_test_TG
-#    distros:
-#      - rhel80-large
-#  - name: server_selection_json_test_TG
-#    distros:
-#      - rhel80-large
-
 - &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)"
@@ -9741,18 +9512,6 @@ 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)"
-  cron: "0 0 * * *" # Every day starting at 00:00
-  expansions:
-    <<: *enterprise-rhel-80-64-bit-multiversion-expansions-template
-    # TODO (SERVER-55857): Remove 'requires_fcv_51' once tests are filtered out using the
-    # 'REQUIRES_FCV_TAG' list in 'multiversion_constants.py'.
-    test_flags: >-
-      --excludeWithAnyTags=requires_fcv_51,multiversion_incompatible
-      --runAllFeatureFlagTests
-
 - name: rhel-80-64-bit-nossl
   display_name: "RHEL 8.0 Shared Library (No SSL)"
   run_on:
@@ -10530,39 +10289,6 @@ buildvariants:
     distros:
     - rhel70-small
 
-- name: enterprise-rhel-72-s390x-all-feature-flags
-  display_name: Enterprise RHEL 7.2 s390x (all feature flags)
-  modules:
-  - enterprise
-  run_on:
-  - rhel72-zseries-test
-  cron: "0 0 1 1 *" # Every year starting 1/1 at 00:00
-  stepback: false
-  expansions:
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
-    release_buid: true
-    compile_flags: --ssl MONGO_DISTMOD=rhel72 -j3 --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
-    resmoke_jobs_max: 2
-    has_packages: true
-    packager_script: packager_enterprise.py
-    packager_arch: s390x
-    packager_distro: rhel72
-    repo_edition: enterprise
-    multiversion_platform: rhel72
-    multiversion_architecture: s390x
-    multiversion_edition: enterprise
-    # 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: >-
-        --runAllFeatureFlagTests
-  tasks:
-  - name: compile_and_archive_dist_test_then_package_TG
-    distros:
-    - rhel72-zseries-build
-  - name: build_variant_gen
-  - name: jsCore
-  - name: replica_sets_jscore_passthrough
-
 - name: rhel-72-s390x
   display_name: RHEL 7.2 s390x
   cron: "0 0 1 1 *" # Every year starting 1/1 at 00:00
@@ -11270,80 +10996,6 @@ buildvariants:
   - name: server_selection_json_test_TG
 
 - <<: *ubuntu1804-debug-asan-template
-  name: ubuntu1804-debug-asan-all-feature-flags
-  display_name: "~ Shared Library ASAN Enterprise Ubuntu 18.04 DEBUG (all feature flags)"
-  cron: "0 0 * * *" # Every day starting at 00:00
-  modules:
-  - enterprise
-  run_on:
-  - ubuntu1804-build
-  stepback: false
-  expansions:
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
-    lang_environment: LANG=C
-    # If you add anything to san_options, make sure the appropriate changes are
-    # also made to SConstruct.
-    san_options: LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
-    compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=address --ssl --ocsp-stapling=off --enable-free-mon=on -j$(grep -c ^processor /proc/cpuinfo)
-    multiversion_platform: ubuntu1804
-    multiversion_edition: enterprise
-    resmoke_jobs_factor: 0.3  # Avoid starting too many mongod's under ASAN build.
-    hang_analyzer_dump_core: false
-    scons_cache_scope: shared
-    exec_timeout_secs: 14400 # 3 hour timeout
-    # 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: >-
-        --runAllFeatureFlagTests
-    separate_debug: off
-  tasks:
-  - name: compile_and_archive_dist_test_then_package_TG
-  - name: compile_benchmarks
-  - name: build_variant_gen
-  - name: .aggregation
-#  - name: .auth
-  - name: audit
-  - name: .causally_consistent !.wo_snapshot
-  - name: .change_streams
-  - name: .misc_js
-#  - name: .concurrency !.ubsan !.no_txns !.kill_terminate
-#  - name: .encrypt
-  - name: free_monitoring
-  - name: external_auth
-  - name: external_auth_aws
-  - name: initial_sync_fuzzer_gen
-  - name: .integration !.standalone !.audit
-  - name: .jscore .common
-  - name: jsCore_minimum_batch_size
-  - name: jsCore_txns_large_txns_format
-  - name: jsonSchema
-  - name: .logical_session_cache
-  - 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: .resharding_fuzzer
-  - name: .retry
-  - name: .read_only
-  - name: .rollbackfuzzer
-  - name: sasl
-  - name: secondary_reads_passthrough_gen
-  - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot
-  - name: .sharding .common !.csrs
-  - name: snmp
-  - name: .tenant_migration
-  - name: .watchdog
-  - name: .stitch
-# Disabling the following tests as they are not aware of feature flags.
-#  - name: .benchmarks
-#  - name: unittest_shell_hang_analyzer_gen
-#  - name: server_discovery_and_monitoring_json_test_TG
-#  - name: server_selection_json_test_TG
-
-- <<: *ubuntu1804-debug-asan-template
   name: ubuntu1804-debug-asan-classic-engine
   display_name: ~ ASAN Enterprise Ubuntu 18.04 DEBUG (Classic Engine)
   cron: "0 0 * * *" # Every day starting at 00:00
@@ -11512,77 +11164,6 @@ buildvariants:
   - name: server_selection_json_test_TG
 
 - <<: *ubuntu1804-debug-ubsan-template
-  name: ubuntu1804-debug-ubsan-all-feature-flags
-  display_name: "~ Shared Library UBSAN Enterprise Ubuntu 18.04 DEBUG (all feature flags)"
-  cron: "0 0 * * *" # Every day starting at 00:00
-  modules:
-  - enterprise
-  run_on:
-  - ubuntu1804-build
-  stepback: false
-  expansions:
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
-    lang_environment: LANG=C
-    # If you add anything to san_options, make sure the appropriate changes are
-    # also made to SConstruct.
-    san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
-    compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --sanitize=undefined --ssl --ocsp-stapling=off --enable-free-mon=on -j$(grep -c ^processor /proc/cpuinfo)
-    # 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: >-
-        --excludeWithAnyTags=requires_ocsp_stapling
-        --runAllFeatureFlagTests
-    multiversion_platform: ubuntu1804
-    multiversion_edition: enterprise
-    resmoke_jobs_factor: 0.3  # Avoid starting too many mongod's under UBSAN build.
-    scons_cache_scope: shared
-    separate_debug: off
-  tasks:
-  - name: compile_and_archive_dist_test_then_package_TG
-  - name: compile_benchmarks
-  - name: build_variant_gen
-  - name: .aggregation
-  - name: .auth
-  - name: audit
-  - name: .causally_consistent !.wo_snapshot
-  - name: .change_streams
-  - name: .misc_js
-  - name: .concurrency !.no_txns !.repl !.kill_terminate
-  - name: disk_wiredtiger
-  - name: .encrypt
-  - name: free_monitoring
-  - name: initial_sync_fuzzer_gen
-  - name: .integration !.audit
-  - name: .jscore .common
-  - name: jsCore_minimum_batch_size
-  - name: jsCore_txns_large_txns_format
-  - name: jsonSchema
-  - 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: .resharding_fuzzer
-  - name: .retry
-  - name: .rollbackfuzzer
-  - name: .read_only
-  - name: sasl
-  - name: secondary_reads_passthrough_gen
-  - name: session_jscore_passthrough
-  - name: .sharding .jscore !.wo_snapshot
-  - name: .sharding .common !.csrs
-  - name: snmp
-  - name: .stitch
-  - name: .tenant_migration
-  - name: .updatefuzzer
-  - name: watchdog_wiredtiger
-# Disabling the following tests as they are not aware of feature flags.
-#  - name: .benchmarks
-#  - name: server_discovery_and_monitoring_json_test_TG
-#  - name: server_selection_json_test_TG
-
-- <<: *ubuntu1804-debug-ubsan-template
   name: ubuntu1804-debug-ubsan-classic-engine
   display_name: ~ UBSAN Enterprise Ubuntu 18.04 DEBUG (Classic Engine)
   cron: "0 0 * * *" # Every day starting at 00:00
@@ -11689,45 +11270,6 @@ buildvariants:
   - name: jsCore_txns
   - name: unittest_shell_hang_analyzer_gen
 
-- <<: *ubuntu1804-debug-aubsan-lite-required-template
-  name: ubuntu1804-debug-aubsan-lite-all-feature-flags-required
-  display_name: "! Shared Library {A,UB}SAN Enterprise Ubuntu 18.04 DEBUG (all feature flags)"
-  cron: "0 */4 * * *" # Every 4 hours starting at midnight
-  expansions:
-    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
-    lang_environment: LANG=C
-    # If you add anything to san_options, make sure the appropriate changes are
-    # also made to SConstruct.
-    san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
-    compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=undefined,address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --link-model=dynamic
-    # 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: >-
-        --excludeWithAnyTags=requires_ocsp_stapling
-        --runAllFeatureFlagTests
-    resmoke_jobs_factor: 0.3  # Avoid starting too many mongod's under {A,UB}SAN build.
-    hang_analyzer_dump_core: false
-    scons_cache_scope: shared
-    scons_cache_mode: all
-    max_sub_suites: 3
-    num_scons_link_jobs_available: 0.99
-    separate_debug: off
-  tasks:
-  - name: compile_test_and_package_parallel_core_stream_TG
-    distros:
-      - ubuntu1804-xlarge
-  - name: build_variant_gen
-  - name: jsCore
-  - name: jsCore_txns
-# Disabling these tests as they are not aware of feature flags.
-#  - name: compile_test_and_package_parallel_unittest_stream_TG
-#    distros:
-#      - ubuntu1804-xlarge
-#  - name: compile_test_and_package_parallel_dbtest_stream_TG
-#    distros:
-#      - ubuntu1804-xlarge
-#  - name: unittest_shell_hang_analyzer_gen
-
 - name: ubuntu1804-debug-aubsan-lite_fuzzer
   display_name: "{A,UB}SAN Enterprise Ubuntu 18.04 FUZZER"
   cron: "0 0 * * *" # Every day starting at 00:00
@@ -12150,19 +11692,3 @@ buildvariants:
     test_flags: >-
       --mongodSetParameters="{internalQueryForceClassicEngine: true}"
       --excludeWithAnyTags=resource_intensive
-
-# Intentionally derive from SBE to run the SBE tests with all feature flags.
-- <<: *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)"
-  cron: "0 0 * * 0" # Every week starting 00:00 on Sunday . 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
-    jstestfuzz_num_generated_files: 20
-    jstestfuzz_concurrent_num_files: 5
-    target_resmoke_time: 30
-    max_sub_suites: 3
-    test_flags: >-
-      --runAllFeatureFlagTests
-      --additionalFeatureFlags=featureFlagSbePlanCache
-      --excludeWithAnyTags=resource_intensive
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index 2e72d4b2d88..029908f8ce0 100755
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -1320,24 +1320,6 @@ buildvariants:
       - name: industry_benchmarks
       - name: linkbench
 
-  - name: linux-shard-lite-all-feature-flags
-    display_name: Linux Shard Lite (all feature flags)
-    cron: "0 0 * * 4" # 00:00 on Thursday
-    modules: *modules
-    expansions:
-      mongodb_setup: shard-lite-all-feature-flags
-      infrastructure_provisioning: shard-lite
-      platform: linux
-      project_dir: *project_dir
-      authentication: enabled
-      storageEngine: wiredTiger
-    run_on:
-      - "rhel70-perf-shard-lite"
-    depends_on: *_compile_amazon2
-    tasks:
-      - name: schedule_patch_auto_tasks
-      - name: schedule_variant_auto_tasks
-
   - name: linux-shard-single
     display_name: Linux Shard Single
     cron: "0 0 * * 0,4" # 00:00 on Sunday,Thursday
@@ -1506,58 +1488,6 @@ buildvariants:
       - name: sb_large_scale
       - name: sb_timeseries
 
-  # Note that the "disabled-feature-flags" part of the name is kept to avoid breaking
-  # history even though the display name is "all feature flags"
-  - name: linux-3-node-replSet-disabled-feature-flags
-    display_name: Linux 3-Node ReplSet (all feature flags)
-    cron: "0 0 * * 4" # 00:00 on Thursday
-    modules: *modules
-    expansions:
-      mongodb_setup: replica-all-feature-flags
-      infrastructure_provisioning: replica
-      platform: linux
-      project_dir: *project_dir
-      authentication: enabled
-      storageEngine: wiredTiger
-    run_on:
-      - "rhel70-perf-replset"
-    depends_on: *_compile_amazon2
-    tasks:
-      - name: schedule_patch_auto_tasks
-      - name: schedule_variant_auto_tasks
-      - name: industry_benchmarks
-      - name: ycsb_60GB
-      - name: industry_benchmarks_secondary_reads
-      - name: crud_workloads
-      - name: crud_workloads_majority
-      - name: mixed_workloads
-      - name: misc_workloads
-      - name: map_reduce_workloads
-      - name: refine_shard_key_transaction_stress
-      - name: smoke_test
-      - name: retryable_writes_workloads
-      - name: industry_benchmarks_wmajority
-      - name: secondary_performance # Uses a special 2 node mongodb setup
-      - name: non_sharded_workloads
-      - name: bestbuy_agg
-      - name: bestbuy_agg_merge_different_db
-      - name: bestbuy_agg_merge_same_db
-      - name: bestbuy_agg_merge_wordcount
-      - name: bestbuy_query
-      - name: change_streams_throughput
-      - name: change_streams_latency
-      - name: snapshot_reads
-      - name: secondary_reads
-      - name: tpcc
-      - name: linkbench
-      - name: linkbench2
-      # Time-series collections are available since v5.0.
-      # - name: tsbs_load
-      # - name: tsbs_query
-      # - name: tsbs_query_manual_bucketing
-      - name: sb_large_scale
-      - name: sb_timeseries
-
   - name: linux-3-node-replSet-noflowcontrol
     display_name: Linux 3-Node ReplSet (Flow Control off)
     cron: "0 0 * * 4" # 00:00 on Thursday