Revert "SERVER-60221 Merge Windows suggested build variants into required"

This reverts commit 11a967245cdff3c73ec6ca0c0ba7dc1dccfa62d3.

1 files changed, 115 insertions, 35 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 5fe1ddd4bf7..5ee5072541c 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -353,6 +353,7 @@ variables:
   - enterprise-ubuntu2004-arm64
   - enterprise-ubuntu2004-64
   - enterprise-windows
+  - enterprise-windows-suggested
   - enterprise-windows-debug-unoptimized
   - enterprise-windows-inmem
   - enterprise-windows-required
@@ -375,6 +376,7 @@ variables:
   - enterprise-amazon2-arm64
   - enterprise-ubuntu1804-64
   - enterprise-windows
+  - enterprise-windows-suggested
   - enterprise-windows-required
 
 # List of all variants that use the packages.tgz
@@ -416,7 +418,7 @@ variables:
   - enterprise-ubuntu2004-arm64
   - enterprise-ubuntu2004-64
   - enterprise-windows
-  - enterprise-windows-required
+  - enterprise-windows-suggested
   - windows
 
 
@@ -8630,7 +8632,7 @@ buildvariants:
   run_on:
   - windows-vsCurrent-small
   expansions:
-    burn_in_tests_build_variant: enterprise-windows-required
+    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
@@ -8651,45 +8653,21 @@ buildvariants:
     push_arch: x86_64-enterprise
     test_flags: *windows_common_test_excludes
   tasks:
-  - name: compile_test_and_package_serial_TG
+  - name: compile_and_archive_dist_test_then_package_TG
     distros:
-      - windows-vsCurrent-xlarge
+    - windows-vsCurrent-xlarge
   - name: compile_build_tools_next_TG
     distros:
     - windows-vsCurrent-xlarge
   - name: build_variant_gen
   - name: burn_in_tests_gen
-  - name: audit
-  - name: auth_audit_gen
   - name: buildscripts_test
-  - 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
-  - name: .replica_sets .multi_oplog
-  - name: replica_sets_ese_gen
-  - name: sasl
   - name: server_discovery_and_monitoring_json_test_TG
   - name: server_selection_json_test_TG
-  - name: .sharding .txns
-  - name: sharding_auth_gen
-  - name: sharding_auth_audit_gen
-  - name: sharding_ese_gen
-  - name: snmp
+  - name: compile_run_and_archive_dbtest_TG
+    distros:
+      - windows-vsCurrent-xlarge
   - name: unittest_shell_hang_analyzer_gen
 
 - <<: *enterprise-windows-required-template
@@ -8697,7 +8675,7 @@ buildvariants:
   display_name: "! Enterprise Windows (all feature flags)"
   cron: "0 */4 * * *" # Every 4 hours starting at midnight
   expansions:
-    burn_in_tests_build_variant: enterprise-windows-required
+    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
@@ -8726,6 +8704,111 @@ buildvariants:
         - 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"
+  cron: "0 */4 * * *" # Every 4 hours starting at midnight
+  modules:
+    - enterprise
+  run_on:
+    - windows-vsCurrent-small
+  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
+    push_path: windows
+    push_bucket: downloads.10gen.com
+    push_name: windows
+    push_arch: x86_64-enterprise
+    test_flags: *windows_common_test_excludes
+  tasks:
+    - name: compile_test_and_package_serial_TG
+      distros:
+        - windows-vsCurrent-xlarge
+    - name: build_variant_gen
+    - name: audit
+    - name: auth_audit_gen
+    - name: buildscripts_test
+    - 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
+    - name: .replica_sets .multi_oplog
+    - name: replica_sets_ese_gen
+    - name: sasl
+    - name: server_discovery_and_monitoring_json_test_TG
+    - name: server_selection_json_test_TG
+    - name: .sharding .txns
+    - name: sharding_auth_gen
+    - name: sharding_auth_audit_gen
+    - name: sharding_ese_gen
+    - 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
@@ -8760,9 +8843,6 @@ buildvariants:
 #    - name: unittest_shell_hang_analyzer_gen
 #    - name: server_selection_json_test_TG
 #    - name: server_discovery_and_monitoring_json_test_TG
-#    - name: compile_run_and_archive_dbtest_TG
-#      distros:
-#        - windows-vsCurrent-xlarge
 
 - <<: *enterprise-windows-nopush-template
   name: enterprise-windows-benchmarks