From 0745e924210454b9b5633b65f78c8b8338d12d9f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 09:45:21 -0500
Subject: [PATCH 01/12] PYTHON-5304 Create standard non-linux tests

---
 .evergreen/generated_configs/tasks.yml      | 1730 ++-----------------
 .evergreen/generated_configs/variants.yml   |  136 +-
 .evergreen/scripts/generate_config.py       |   40 +-
 .evergreen/scripts/generate_config_utils.py |    2 +-
 4 files changed, 250 insertions(+), 1658 deletions(-)

diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index 89d8ff8d6c..8221f607da 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -3279,25 +3279,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.0-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3338,25 +3319,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.0-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3397,25 +3359,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.0-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.2-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3456,25 +3399,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.2-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.2-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3515,25 +3439,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.2-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.2-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3574,25 +3479,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.2-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.4-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3633,25 +3519,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.4-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.4-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3692,25 +3559,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.4-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.4-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3751,25 +3599,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.4-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-5.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3810,25 +3639,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-5.0-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-5.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3869,25 +3679,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-5.0-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-5.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3928,25 +3719,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-5.0-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-6.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3987,25 +3759,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-6.0-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-6.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4046,25 +3799,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-6.0-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-6.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4105,25 +3839,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-6.0-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-7.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -4164,25 +3879,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-7.0-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-7.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4223,25 +3919,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-7.0-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-7.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4282,25 +3959,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-7.0-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-8.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -4341,25 +3999,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-8.0-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-8.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4400,25 +4039,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-8.0-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-8.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4459,25 +4079,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-8.0-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-rapid-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -4518,25 +4119,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-rapid-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-rapid-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4577,25 +4159,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-rapid-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-rapid-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4636,25 +4199,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-rapid-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-latest-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -4695,25 +4239,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-latest-standalone-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: server
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - latest
-      - standalone
-      - auth
-      - ssl
-      - sync_async
   - name: test-latest-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4754,25 +4279,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-latest-standalone-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - latest
-      - standalone
-      - noauth
-      - ssl
-      - sync_async
   - name: test-latest-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4813,25 +4319,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-latest-standalone-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: server
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - latest
-      - standalone
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -4872,25 +4359,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.0-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -4931,25 +4399,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.0-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -4990,25 +4439,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.0-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.2-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5049,25 +4479,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.2-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.2-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5108,25 +4519,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.2-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.2-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5167,25 +4559,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.2-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.4-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5226,25 +4599,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.4-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.4-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5285,25 +4639,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.4-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.4-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5344,25 +4679,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.4-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-5.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5403,25 +4719,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-5.0-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-5.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5462,25 +4759,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-5.0-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-5.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5521,25 +4799,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-5.0-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-6.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5580,25 +4839,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-6.0-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-6.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5639,25 +4879,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-6.0-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-6.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5698,25 +4919,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-6.0-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-7.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5757,25 +4959,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-7.0-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-7.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5816,25 +4999,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-7.0-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-7.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5875,25 +5039,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-7.0-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-8.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5934,25 +5079,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-8.0-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-8.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5993,25 +5119,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-8.0-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-8.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -6052,25 +5159,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-8.0-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-rapid-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -6111,25 +5199,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-rapid-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-rapid-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -6170,25 +5239,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-rapid-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-rapid-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -6229,25 +5279,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-rapid-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-latest-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -6288,25 +5319,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-latest-replica_set-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: replica_set
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - latest
-      - replica_set
-      - auth
-      - ssl
-      - sync_async
   - name: test-latest-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -6347,25 +5359,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-latest-replica_set-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - latest
-      - replica_set
-      - noauth
-      - ssl
-      - sync_async
   - name: test-latest-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -6406,25 +5399,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-latest-replica_set-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: replica_set
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - latest
-      - replica_set
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6465,25 +5439,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.0-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -6524,25 +5479,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.0-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -6583,25 +5519,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.0-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.0"
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.2-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6642,25 +5559,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.2-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.2-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -6701,25 +5599,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.2-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.2-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -6760,25 +5639,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.2-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.2"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.2"
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-4.4-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6819,25 +5679,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-4.4-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-4.4-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -6878,25 +5719,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-4.4-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-4.4-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -6937,25 +5759,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-4.4-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "4.4"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "4.4"
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-5.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6996,25 +5799,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-5.0-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-5.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -7055,25 +5839,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-5.0-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-5.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -7114,25 +5879,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-5.0-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "5.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "5.0"
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-6.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -7173,25 +5919,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-6.0-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-6.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -7232,25 +5959,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-6.0-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-6.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -7291,25 +5999,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-6.0-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "6.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "6.0"
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-7.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -7350,25 +6039,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-7.0-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-7.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -7409,25 +6079,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-7.0-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-7.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -7468,25 +6119,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-7.0-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "7.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "7.0"
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-8.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -7527,25 +6159,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-8.0-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-8.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -7586,25 +6199,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-8.0-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-8.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -7645,25 +6239,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-8.0-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: "8.0"
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - "8.0"
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-rapid-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -7704,25 +6279,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-rapid-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-rapid-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -7763,25 +6319,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-rapid-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-rapid-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -7822,25 +6359,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-rapid-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: rapid
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - rapid
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
   - name: test-latest-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -7881,25 +6399,6 @@ tasks:
       - auth
       - ssl
       - async
-  - name: test-latest-sharded_cluster-auth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: sharded_cluster
-          AUTH: auth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - latest
-      - sharded_cluster
-      - auth
-      - ssl
-      - sync_async
   - name: test-latest-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -7940,25 +6439,6 @@ tasks:
       - noauth
       - ssl
       - async
-  - name: test-latest-sharded_cluster-noauth-ssl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: ssl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          SYNC: sync_async
-    tags:
-      - latest
-      - sharded_cluster
-      - noauth
-      - ssl
-      - sync_async
   - name: test-latest-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -7999,25 +6479,6 @@ tasks:
       - noauth
       - nossl
       - async
-  - name: test-latest-sharded_cluster-noauth-nossl-sync_async
-    commands:
-      - func: run server
-        vars:
-          VERSION: latest
-          TOPOLOGY: sharded_cluster
-          AUTH: noauth
-          SSL: nossl
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          SYNC: sync_async
-    tags:
-      - latest
-      - sharded_cluster
-      - noauth
-      - nossl
-      - sync_async
 
   # Server version tests
   - name: test-python3.9-auth-ssl-sharded-cluster-cov
@@ -8296,3 +6757,194 @@ tasks:
           AUTH: auth
           SSL: ssl
     tags: [serverless]
+
+  # Standard non linux tests
+  - name: test-v4.0-python3.9-noauth-ssl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          VERSION: "4.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          VERSION: "4.0"
+          PYTHON_VERSION: "3.9"
+          TASK_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-4.0
+      - "3.9"
+      - standalone-noauth-ssl
+  - name: test-v4.2-python3.10-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "4.2"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "4.2"
+          PYTHON_VERSION: "3.10"
+          TASK_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-4.2
+      - "3.10"
+      - replica_set-noauth-ssl
+  - name: test-v4.4-python3.11-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "4.4"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "4.4"
+          PYTHON_VERSION: "3.11"
+          TASK_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-4.4
+      - "3.11"
+      - sharded_cluster-auth-ssl
+  - name: test-v5.0-python3.12-noauth-ssl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          VERSION: "5.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          VERSION: "5.0"
+          PYTHON_VERSION: "3.12"
+          TASK_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-5.0
+      - "3.12"
+      - standalone-noauth-ssl
+  - name: test-v6.0-python3.13-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "6.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "6.0"
+          PYTHON_VERSION: "3.13"
+          TASK_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-6.0
+      - "3.13"
+      - replica_set-noauth-ssl
+  - name: test-v7.0-python3.9-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "7.0"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "7.0"
+          PYTHON_VERSION: "3.9"
+          TASK_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-7.0
+      - "3.9"
+      - sharded_cluster-auth-ssl
+  - name: test-v8.0-python3.10-noauth-ssl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          VERSION: "8.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: standalone
+          VERSION: "8.0"
+          PYTHON_VERSION: "3.10"
+          TASK_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-8.0
+      - "3.10"
+      - standalone-noauth-ssl
+  - name: test-rapid-python3.11-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: rapid
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: rapid
+          PYTHON_VERSION: "3.11"
+          TASK_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-rapid
+      - "3.11"
+      - replica_set-noauth-ssl
+  - name: test-latest-python3.12-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: latest
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: latest
+          PYTHON_VERSION: "3.12"
+          TASK_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-latest
+      - "3.12"
+      - sharded_cluster-auth-ssl
diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml
index 0aa2ac7454..82c6fd61fd 100644
--- a/.evergreen/generated_configs/variants.yml
+++ b/.evergreen/generated_configs/variants.yml
@@ -804,112 +804,6 @@ buildvariants:
     expansions:
       PYTHON_BINARY: /opt/python/3.9/bin/python3
 
-  # Server tests
-  - name: test-macos-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test macOS Python3.9"
-    run_on:
-      - macos-14
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-  - name: test-macos-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test macOS Python3.13"
-    run_on:
-      - macos-14
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
-  - name: test-macos-arm64-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl .6.0 !.sync_async
-      - name: .replica_set .noauth .ssl .6.0 !.sync_async
-      - name: .standalone .noauth .nossl .6.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .7.0 !.sync_async
-      - name: .replica_set .noauth .ssl .7.0 !.sync_async
-      - name: .standalone .noauth .nossl .7.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .8.0 !.sync_async
-      - name: .replica_set .noauth .ssl .8.0 !.sync_async
-      - name: .standalone .noauth .nossl .8.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .rapid !.sync_async
-      - name: .replica_set .noauth .ssl .rapid !.sync_async
-      - name: .standalone .noauth .nossl .rapid !.sync_async
-      - name: .sharded_cluster .auth .ssl .latest !.sync_async
-      - name: .replica_set .noauth .ssl .latest !.sync_async
-      - name: .standalone .noauth .nossl .latest !.sync_async
-    display_name: "* Test macOS Arm64 Python3.9"
-    run_on:
-      - macos-14-arm64
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-  - name: test-macos-arm64-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl .6.0 !.sync_async
-      - name: .replica_set .noauth .ssl .6.0 !.sync_async
-      - name: .standalone .noauth .nossl .6.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .7.0 !.sync_async
-      - name: .replica_set .noauth .ssl .7.0 !.sync_async
-      - name: .standalone .noauth .nossl .7.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .8.0 !.sync_async
-      - name: .replica_set .noauth .ssl .8.0 !.sync_async
-      - name: .standalone .noauth .nossl .8.0 !.sync_async
-      - name: .sharded_cluster .auth .ssl .rapid !.sync_async
-      - name: .replica_set .noauth .ssl .rapid !.sync_async
-      - name: .standalone .noauth .nossl .rapid !.sync_async
-      - name: .sharded_cluster .auth .ssl .latest !.sync_async
-      - name: .replica_set .noauth .ssl .latest !.sync_async
-      - name: .standalone .noauth .nossl .latest !.sync_async
-    display_name: "* Test macOS Arm64 Python3.13"
-    run_on:
-      - macos-14-arm64
-    expansions:
-      PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
-  - name: test-win64-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win64 Python3.9"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/Python39/python.exe
-  - name: test-win64-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win64 Python3.13"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/Python313/python.exe
-  - name: test-win32-python3.9
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win32 Python3.9"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/32/Python39/python.exe
-  - name: test-win32-python3.13
-    tasks:
-      - name: .sharded_cluster .auth .ssl !.sync_async
-      - name: .replica_set .noauth .ssl !.sync_async
-      - name: .standalone .noauth .nossl !.sync_async
-    display_name: "* Test Win32 Python3.13"
-    run_on:
-      - windows-64-vsMulti-small
-    expansions:
-      PYTHON_BINARY: C:/python/32/Python313/python.exe
-
   # Server version tests
   - name: mongodb-v4.0
     tasks:
@@ -1063,6 +957,36 @@ buildvariants:
       PYTHON_BINARY: /opt/python/3.13/bin/python3
     tags: [versionedApi_tag]
 
+  # Standard nonlinux tests
+  - name: test-macos
+    tasks:
+      - name: .standard-non-linux
+    display_name: "* Test macOS"
+    run_on:
+      - macos-14
+  - name: test-macos-arm64
+    tasks:
+      - name: .standard-non-linux .server-6.0
+      - name: .standard-non-linux .server-7.0
+      - name: .standard-non-linux .server-8.0
+      - name: .standard-non-linux .server-rapid
+      - name: .standard-non-linux .server-latest
+    display_name: "* Test macOS Arm64"
+    run_on:
+      - macos-14-arm64
+  - name: test-win64
+    tasks:
+      - name: .standard-non-linux
+    display_name: "* Test Win64"
+    run_on:
+      - windows-64-vsMulti-small
+  - name: test-win32
+    tasks:
+      - name: .standard-non-linux
+    display_name: "* Test Win32"
+    run_on:
+      - windows-64-vsMulti-small
+
   # Storage engine tests
   - name: storage-inmemory-rhel8-python3.9
     tasks:
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index 2f1e978252..83b92a6f56 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -77,23 +77,22 @@ def create_server_version_variants() -> list[BuildVariant]:
     return variants
 
 
-def create_server_variants() -> list[BuildVariant]:
+def create_standard_nonlinux_variants() -> list[BuildVariant]:
     variants = []
     base_display_name = "* Test"
 
     # Test a subset on each of the other platforms.
     for host_name in ("macos", "macos-arm64", "win64", "win32"):
-        for python in MIN_MAX_PYTHON:
-            tasks = [f"{t} !.sync_async" for t in SUB_TASKS]
-            # MacOS arm64 only works on server versions 6.0+
-            if host_name == "macos-arm64":
-                tasks = []
-                for version in get_versions_from("6.0"):
-                    tasks.extend(f"{t} .{version} !.sync_async" for t in SUB_TASKS)
-            host = HOSTS[host_name]
-            display_name = get_variant_name(base_display_name, host, python=python)
-            variant = create_variant(tasks, display_name, python=python, host=host)
-            variants.append(variant)
+        tasks = [".standard-non-linux"]
+        # MacOS arm64 only works on server versions 6.0+
+        if host_name == "macos-arm64":
+            tasks = [
+                f".standard-non-linux .server-{version}" for version in get_versions_from("6.0")
+            ]
+        host = HOSTS[host_name]
+        display_name = get_variant_name(base_display_name, host)
+        variant = create_variant(tasks, display_name, host=host)
+        variants.append(variant)
 
     return variants
 
@@ -604,6 +603,23 @@ def create_server_version_tasks():
     return tasks
 
 
+def create_standard_non_linux_tasks():
+    tasks = []
+    for version, python, topology, sync in zip_cycle(ALL_VERSIONS, CPYTHONS, TOPOLOGIES, SYNCS):
+        auth = "auth" if topology == "sharded_cluster" else "noauth"
+        ssl = "nossl" if topology == "stanadlone" else "ssl"
+        tags = ["standard-non-linux", f"server-{version}", python, f"{topology}-{auth}-{ssl}"]
+        expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
+        name = get_task_name("test", python=python, **expansions)
+        server_func = FunctionCall(func="run server", vars=expansions)
+        test_vars = expansions.copy()
+        test_vars["PYTHON_VERSION"] = python
+        test_vars["TASK_NAME"] = f"default_{sync}"
+        test_func = FunctionCall(func="run tests", vars=test_vars)
+        tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
+    return tasks
+
+
 def create_server_tasks():
     tasks = []
     for topo, version, (auth, ssl), sync in product(TOPOLOGIES, ALL_VERSIONS, AUTH_SSLS, SYNCS):
diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py
index 59de5beb70..8eb13aede0 100644
--- a/.evergreen/scripts/generate_config_utils.py
+++ b/.evergreen/scripts/generate_config_utils.py
@@ -36,7 +36,7 @@
     ".replica_set .noauth .ssl",
     ".standalone .noauth .nossl",
 ]
-SYNCS = ["sync", "async", "sync_async"]
+SYNCS = ["sync", "async"]
 DISPLAY_LOOKUP = dict(
     ssl=dict(ssl="SSL", nossl="NoSSL"),
     auth=dict(auth="Auth", noauth="NoAuth"),

From 7b9fb1cbc8e747482ac9a787ad2fd9ab8fc0c6d8 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 09:47:11 -0500
Subject: [PATCH 02/12] fix tasks

---
 .evergreen/generated_configs/tasks.yml | 1539 ++++++++++++++++++++++++
 .evergreen/scripts/generate_config.py  |    4 +-
 2 files changed, 1542 insertions(+), 1 deletion(-)

diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index 8221f607da..153ca45e1e 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -3279,6 +3279,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.0-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3319,6 +3338,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.0-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3359,6 +3397,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.0-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.2-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3399,6 +3456,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.2-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.2-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3439,6 +3515,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.2-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.2-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3479,6 +3574,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.2-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.4-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3519,6 +3633,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.4-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.4-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3559,6 +3692,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.4-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.4-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3599,6 +3751,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.4-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-5.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3639,6 +3810,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-5.0-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-5.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3679,6 +3869,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-5.0-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-5.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3719,6 +3928,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-5.0-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-6.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3759,6 +3987,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-6.0-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-6.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3799,6 +4046,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-6.0-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-6.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3839,6 +4105,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-6.0-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-7.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3879,6 +4164,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-7.0-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-7.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -3919,6 +4223,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-7.0-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-7.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -3959,6 +4282,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-7.0-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-8.0-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -3999,6 +4341,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-8.0-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-8.0-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4039,6 +4400,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-8.0-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-8.0-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4079,6 +4459,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-8.0-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-rapid-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -4119,6 +4518,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-rapid-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-rapid-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4159,6 +4577,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-rapid-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-rapid-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4199,6 +4636,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-rapid-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-latest-standalone-auth-ssl-sync
     commands:
       - func: run server
@@ -4239,6 +4695,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-latest-standalone-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: server
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - latest
+      - standalone
+      - auth
+      - ssl
+      - sync_async
   - name: test-latest-standalone-noauth-ssl-sync
     commands:
       - func: run server
@@ -4279,6 +4754,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-latest-standalone-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - latest
+      - standalone
+      - noauth
+      - ssl
+      - sync_async
   - name: test-latest-standalone-noauth-nossl-sync
     commands:
       - func: run server
@@ -4319,6 +4813,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-latest-standalone-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: server
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - latest
+      - standalone
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -4359,6 +4872,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.0-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -4399,6 +4931,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.0-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -4439,6 +4990,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.0-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.2-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -4479,6 +5049,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.2-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.2-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -4519,6 +5108,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.2-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.2-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -4559,6 +5167,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.2-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.4-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -4599,6 +5226,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.4-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.4-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -4639,6 +5285,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.4-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.4-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -4679,6 +5344,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.4-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-5.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -4719,6 +5403,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-5.0-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-5.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -4759,6 +5462,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-5.0-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-5.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -4799,6 +5521,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-5.0-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-6.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -4839,6 +5580,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-6.0-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-6.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -4879,6 +5639,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-6.0-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-6.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -4919,6 +5698,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-6.0-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-7.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -4959,6 +5757,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-7.0-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-7.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -4999,6 +5816,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-7.0-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-7.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5039,6 +5875,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-7.0-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-8.0-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5079,6 +5934,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-8.0-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-8.0-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5119,6 +5993,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-8.0-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-8.0-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5159,6 +6052,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-8.0-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-rapid-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5199,6 +6111,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-rapid-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-rapid-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5239,6 +6170,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-rapid-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-rapid-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5279,6 +6229,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-rapid-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-latest-replica_set-auth-ssl-sync
     commands:
       - func: run server
@@ -5319,6 +6288,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-latest-replica_set-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: replica_set
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - latest
+      - replica_set
+      - auth
+      - ssl
+      - sync_async
   - name: test-latest-replica_set-noauth-ssl-sync
     commands:
       - func: run server
@@ -5359,6 +6347,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-latest-replica_set-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - latest
+      - replica_set
+      - noauth
+      - ssl
+      - sync_async
   - name: test-latest-replica_set-noauth-nossl-sync
     commands:
       - func: run server
@@ -5399,6 +6406,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-latest-replica_set-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: replica_set
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - latest
+      - replica_set
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -5439,6 +6465,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.0-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -5479,6 +6524,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.0-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -5519,6 +6583,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.0-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.0"
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.2-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -5559,6 +6642,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.2-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.2-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -5599,6 +6701,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.2-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.2-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -5639,6 +6760,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.2-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.2"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.2"
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-4.4-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -5679,6 +6819,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-4.4-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-4.4-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -5719,6 +6878,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-4.4-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-4.4-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -5759,6 +6937,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-4.4-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "4.4"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "4.4"
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-5.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -5799,6 +6996,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-5.0-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-5.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -5839,6 +7055,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-5.0-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-5.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -5879,6 +7114,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-5.0-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "5.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "5.0"
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-6.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -5919,6 +7173,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-6.0-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-6.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -5959,6 +7232,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-6.0-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-6.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -5999,6 +7291,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-6.0-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "6.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "6.0"
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-7.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6039,6 +7350,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-7.0-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-7.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -6079,6 +7409,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-7.0-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-7.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -6119,6 +7468,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-7.0-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "7.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "7.0"
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-8.0-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6159,6 +7527,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-8.0-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-8.0-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -6199,6 +7586,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-8.0-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-8.0-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -6239,6 +7645,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-8.0-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: "8.0"
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - "8.0"
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-rapid-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6279,6 +7704,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-rapid-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-rapid-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -6319,6 +7763,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-rapid-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-rapid-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -6359,6 +7822,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-rapid-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: rapid
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - rapid
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
   - name: test-latest-sharded_cluster-auth-ssl-sync
     commands:
       - func: run server
@@ -6399,6 +7881,25 @@ tasks:
       - auth
       - ssl
       - async
+  - name: test-latest-sharded_cluster-auth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: sharded_cluster
+          AUTH: auth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - latest
+      - sharded_cluster
+      - auth
+      - ssl
+      - sync_async
   - name: test-latest-sharded_cluster-noauth-ssl-sync
     commands:
       - func: run server
@@ -6439,6 +7940,25 @@ tasks:
       - noauth
       - ssl
       - async
+  - name: test-latest-sharded_cluster-noauth-ssl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: ssl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          SYNC: sync_async
+    tags:
+      - latest
+      - sharded_cluster
+      - noauth
+      - ssl
+      - sync_async
   - name: test-latest-sharded_cluster-noauth-nossl-sync
     commands:
       - func: run server
@@ -6479,6 +7999,25 @@ tasks:
       - noauth
       - nossl
       - async
+  - name: test-latest-sharded_cluster-noauth-nossl-sync_async
+    commands:
+      - func: run server
+        vars:
+          VERSION: latest
+          TOPOLOGY: sharded_cluster
+          AUTH: noauth
+          SSL: nossl
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          SYNC: sync_async
+    tags:
+      - latest
+      - sharded_cluster
+      - noauth
+      - nossl
+      - sync_async
 
   # Server version tests
   - name: test-python3.9-auth-ssl-sharded-cluster-cov
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index 83b92a6f56..b4d56cf3c4 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -622,7 +622,9 @@ def create_standard_non_linux_tasks():
 
 def create_server_tasks():
     tasks = []
-    for topo, version, (auth, ssl), sync in product(TOPOLOGIES, ALL_VERSIONS, AUTH_SSLS, SYNCS):
+    for topo, version, (auth, ssl), sync in product(
+        TOPOLOGIES, ALL_VERSIONS, AUTH_SSLS, [*SYNCS, "sync_async"]
+    ):
         name = f"test-{version}-{topo}-{auth}-{ssl}-{sync}".lower()
         tags = [version, topo, auth, ssl, sync]
         server_vars = dict(

From c65fb7e2371b5a06298991c8c8ea769b9cea6c07 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 09:48:03 -0500
Subject: [PATCH 03/12] add sync to name

---
 .evergreen/scripts/generate_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index b4d56cf3c4..d23683058d 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -610,7 +610,7 @@ def create_standard_non_linux_tasks():
         ssl = "nossl" if topology == "stanadlone" else "ssl"
         tags = ["standard-non-linux", f"server-{version}", python, f"{topology}-{auth}-{ssl}"]
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
-        name = get_task_name("test", python=python, **expansions)
+        name = get_task_name("test", python=python, sync=sync, **expansions)
         server_func = FunctionCall(func="run server", vars=expansions)
         test_vars = expansions.copy()
         test_vars["PYTHON_VERSION"] = python

From b2d09a9060fc24b0764169ee16a929b5f3000194 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 09:49:08 -0500
Subject: [PATCH 04/12] add sync to name

---
 .evergreen/generated_configs/tasks.yml      | 18 +++++++++---------
 .evergreen/scripts/generate_config_utils.py |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index 153ca45e1e..85710ad51a 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -8298,7 +8298,7 @@ tasks:
     tags: [serverless]
 
   # Standard non linux tests
-  - name: test-v4.0-python3.9-noauth-ssl-standalone
+  - name: test-v4.0-python3.9-sync-noauth-ssl-standalone
     commands:
       - func: run server
         vars:
@@ -8319,7 +8319,7 @@ tasks:
       - server-4.0
       - "3.9"
       - standalone-noauth-ssl
-  - name: test-v4.2-python3.10-noauth-ssl-replica-set
+  - name: test-v4.2-python3.10-async-noauth-ssl-replica-set
     commands:
       - func: run server
         vars:
@@ -8340,7 +8340,7 @@ tasks:
       - server-4.2
       - "3.10"
       - replica_set-noauth-ssl
-  - name: test-v4.4-python3.11-auth-ssl-sharded-cluster
+  - name: test-v4.4-python3.11-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
@@ -8361,7 +8361,7 @@ tasks:
       - server-4.4
       - "3.11"
       - sharded_cluster-auth-ssl
-  - name: test-v5.0-python3.12-noauth-ssl-standalone
+  - name: test-v5.0-python3.12-async-noauth-ssl-standalone
     commands:
       - func: run server
         vars:
@@ -8382,7 +8382,7 @@ tasks:
       - server-5.0
       - "3.12"
       - standalone-noauth-ssl
-  - name: test-v6.0-python3.13-noauth-ssl-replica-set
+  - name: test-v6.0-python3.13-sync-noauth-ssl-replica-set
     commands:
       - func: run server
         vars:
@@ -8403,7 +8403,7 @@ tasks:
       - server-6.0
       - "3.13"
       - replica_set-noauth-ssl
-  - name: test-v7.0-python3.9-auth-ssl-sharded-cluster
+  - name: test-v7.0-python3.9-async-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
@@ -8424,7 +8424,7 @@ tasks:
       - server-7.0
       - "3.9"
       - sharded_cluster-auth-ssl
-  - name: test-v8.0-python3.10-noauth-ssl-standalone
+  - name: test-v8.0-python3.10-sync-noauth-ssl-standalone
     commands:
       - func: run server
         vars:
@@ -8445,7 +8445,7 @@ tasks:
       - server-8.0
       - "3.10"
       - standalone-noauth-ssl
-  - name: test-rapid-python3.11-noauth-ssl-replica-set
+  - name: test-rapid-python3.11-async-noauth-ssl-replica-set
     commands:
       - func: run server
         vars:
@@ -8466,7 +8466,7 @@ tasks:
       - server-rapid
       - "3.11"
       - replica_set-noauth-ssl
-  - name: test-latest-python3.12-auth-ssl-sharded-cluster
+  - name: test-latest-python3.12-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py
index 8eb13aede0..aa43af9a68 100644
--- a/.evergreen/scripts/generate_config_utils.py
+++ b/.evergreen/scripts/generate_config_utils.py
@@ -44,6 +44,7 @@
         standalone="Standalone", replica_set="Replica Set", sharded_cluster="Sharded Cluster"
     ),
     test_suites=dict(default="Sync", default_async="Async"),
+    sync={"sync": "Sync", "async": "Async"},
     coverage={"1": "cov"},
     no_ext={"1": "No C"},
 )

From bf812717d5e3982f1d1ca1ac30229d8a44f4e288 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 09:58:16 -0500
Subject: [PATCH 05/12] fix ssl handling

---
 .evergreen/generated_configs/tasks.yml | 24 ++++++++++++------------
 .evergreen/scripts/generate_config.py  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index 85710ad51a..d661a16553 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -8298,18 +8298,18 @@ tasks:
     tags: [serverless]
 
   # Standard non linux tests
-  - name: test-v4.0-python3.9-sync-noauth-ssl-standalone
+  - name: test-v4.0-python3.9-sync-noauth-nossl-standalone
     commands:
       - func: run server
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: standalone
           VERSION: "4.0"
       - func: run tests
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: standalone
           VERSION: "4.0"
           PYTHON_VERSION: "3.9"
@@ -8318,7 +8318,7 @@ tasks:
       - standard-non-linux
       - server-4.0
       - "3.9"
-      - standalone-noauth-ssl
+      - standalone-noauth-nossl
   - name: test-v4.2-python3.10-async-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8361,18 +8361,18 @@ tasks:
       - server-4.4
       - "3.11"
       - sharded_cluster-auth-ssl
-  - name: test-v5.0-python3.12-async-noauth-ssl-standalone
+  - name: test-v5.0-python3.12-async-noauth-nossl-standalone
     commands:
       - func: run server
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: standalone
           VERSION: "5.0"
       - func: run tests
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: standalone
           VERSION: "5.0"
           PYTHON_VERSION: "3.12"
@@ -8381,7 +8381,7 @@ tasks:
       - standard-non-linux
       - server-5.0
       - "3.12"
-      - standalone-noauth-ssl
+      - standalone-noauth-nossl
   - name: test-v6.0-python3.13-sync-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8424,18 +8424,18 @@ tasks:
       - server-7.0
       - "3.9"
       - sharded_cluster-auth-ssl
-  - name: test-v8.0-python3.10-sync-noauth-ssl-standalone
+  - name: test-v8.0-python3.10-sync-noauth-nossl-standalone
     commands:
       - func: run server
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: standalone
           VERSION: "8.0"
       - func: run tests
         vars:
           AUTH: noauth
-          SSL: ssl
+          SSL: nossl
           TOPOLOGY: standalone
           VERSION: "8.0"
           PYTHON_VERSION: "3.10"
@@ -8444,7 +8444,7 @@ tasks:
       - standard-non-linux
       - server-8.0
       - "3.10"
-      - standalone-noauth-ssl
+      - standalone-noauth-nossl
   - name: test-rapid-python3.11-async-noauth-ssl-replica-set
     commands:
       - func: run server
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index d23683058d..5d9b8d5e38 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -607,7 +607,7 @@ def create_standard_non_linux_tasks():
     tasks = []
     for version, python, topology, sync in zip_cycle(ALL_VERSIONS, CPYTHONS, TOPOLOGIES, SYNCS):
         auth = "auth" if topology == "sharded_cluster" else "noauth"
-        ssl = "nossl" if topology == "stanadlone" else "ssl"
+        ssl = "nossl" if topology == "standalone" else "ssl"
         tags = ["standard-non-linux", f"server-{version}", python, f"{topology}-{auth}-{ssl}"]
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
         name = get_task_name("test", python=python, sync=sync, **expansions)

From 2df5df4974d195a365fd6c2cff2158a98dc203b4 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 10:46:06 -0500
Subject: [PATCH 06/12] add a tag to the standard non linux tests

---
 .evergreen/generated_configs/variants.yml | 4 ++++
 .evergreen/scripts/generate_config.py     | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml
index 82c6fd61fd..64ce3c5633 100644
--- a/.evergreen/generated_configs/variants.yml
+++ b/.evergreen/generated_configs/variants.yml
@@ -964,6 +964,7 @@ buildvariants:
     display_name: "* Test macOS"
     run_on:
       - macos-14
+    tags: [standard-non-linux]
   - name: test-macos-arm64
     tasks:
       - name: .standard-non-linux .server-6.0
@@ -974,18 +975,21 @@ buildvariants:
     display_name: "* Test macOS Arm64"
     run_on:
       - macos-14-arm64
+    tags: [standard-non-linux]
   - name: test-win64
     tasks:
       - name: .standard-non-linux
     display_name: "* Test Win64"
     run_on:
       - windows-64-vsMulti-small
+    tags: [standard-non-linux]
   - name: test-win32
     tasks:
       - name: .standard-non-linux
     display_name: "* Test Win32"
     run_on:
       - windows-64-vsMulti-small
+    tags: [standard-non-linux]
 
   # Storage engine tests
   - name: storage-inmemory-rhel8-python3.9
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index 5d9b8d5e38..892614d3d1 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -90,8 +90,9 @@ def create_standard_nonlinux_variants() -> list[BuildVariant]:
                 f".standard-non-linux .server-{version}" for version in get_versions_from("6.0")
             ]
         host = HOSTS[host_name]
+        tags = ["standard-non-linux"]
         display_name = get_variant_name(base_display_name, host)
-        variant = create_variant(tasks, display_name, host=host)
+        variant = create_variant(tasks, display_name, host=host, tags=tags)
         variants.append(variant)
 
     return variants

From f68b59490b384f51659ce94f152f9e4b2c0cbfe2 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 10:48:42 -0500
Subject: [PATCH 07/12] clean up tags

---
 .evergreen/generated_configs/tasks.yml | 61 +++++++++++++++-----------
 .evergreen/scripts/generate_config.py  | 10 ++++-
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index d661a16553..57006d0736 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -8035,7 +8035,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.9"
-    tags: [server-version, "3.9", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.9, sharded_cluster-auth-ssl]
   - name: test-python3.10-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8051,7 +8051,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.10"
-    tags: [server-version, "3.10", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.10, sharded_cluster-auth-ssl]
   - name: test-python3.11-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8067,7 +8067,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.11"
-    tags: [server-version, "3.11", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.11, sharded_cluster-auth-ssl]
   - name: test-python3.12-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8083,7 +8083,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.12"
-    tags: [server-version, "3.12", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.12, sharded_cluster-auth-ssl]
   - name: test-python3.13-auth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8099,7 +8099,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.13"
-    tags: [server-version, "3.13", sharded_cluster-auth-ssl]
+    tags: [server-version, python-3.13, sharded_cluster-auth-ssl]
   - name: test-pypy3.10-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8113,7 +8113,7 @@ tasks:
           SSL: ssl
           TOPOLOGY: sharded_cluster
           PYTHON_VERSION: pypy3.10
-    tags: [server-version, pypy3.10, sharded_cluster-auth-ssl]
+    tags: [server-version, python-pypy3.10, sharded_cluster-auth-ssl]
   - name: test-python3.9-auth-ssl-standalone-cov
     commands:
       - func: run server
@@ -8129,7 +8129,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.9"
-    tags: [server-version, "3.9", standalone-auth-ssl]
+    tags: [server-version, python-3.9, standalone-auth-ssl]
   - name: test-python3.10-auth-nossl-standalone-cov
     commands:
       - func: run server
@@ -8145,7 +8145,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.10"
-    tags: [server-version, "3.10", standalone-auth-nossl]
+    tags: [server-version, python-3.10, standalone-auth-nossl]
   - name: test-python3.11-noauth-ssl-standalone-cov
     commands:
       - func: run server
@@ -8161,7 +8161,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.11"
-    tags: [server-version, "3.11", standalone-noauth-ssl]
+    tags: [server-version, python-3.11, standalone-noauth-ssl]
   - name: test-python3.12-noauth-nossl-standalone-cov
     commands:
       - func: run server
@@ -8177,7 +8177,7 @@ tasks:
           TOPOLOGY: standalone
           COVERAGE: "1"
           PYTHON_VERSION: "3.12"
-    tags: [server-version, "3.12", standalone-noauth-nossl]
+    tags: [server-version, python-3.12, standalone-noauth-nossl]
   - name: test-python3.13-auth-ssl-replica-set-cov
     commands:
       - func: run server
@@ -8193,7 +8193,7 @@ tasks:
           TOPOLOGY: replica_set
           COVERAGE: "1"
           PYTHON_VERSION: "3.13"
-    tags: [server-version, "3.13", replica_set-auth-ssl]
+    tags: [server-version, python-3.13, replica_set-auth-ssl]
   - name: test-pypy3.10-auth-nossl-replica-set
     commands:
       - func: run server
@@ -8207,7 +8207,7 @@ tasks:
           SSL: nossl
           TOPOLOGY: replica_set
           PYTHON_VERSION: pypy3.10
-    tags: [server-version, pypy3.10, replica_set-auth-nossl]
+    tags: [server-version, python-pypy3.10, replica_set-auth-nossl]
   - name: test-python3.9-noauth-ssl-replica-set-cov
     commands:
       - func: run server
@@ -8223,7 +8223,7 @@ tasks:
           TOPOLOGY: replica_set
           COVERAGE: "1"
           PYTHON_VERSION: "3.9"
-    tags: [server-version, "3.9", replica_set-noauth-ssl]
+    tags: [server-version, python-3.9, replica_set-noauth-ssl]
   - name: test-python3.10-noauth-nossl-replica-set-cov
     commands:
       - func: run server
@@ -8239,7 +8239,7 @@ tasks:
           TOPOLOGY: replica_set
           COVERAGE: "1"
           PYTHON_VERSION: "3.10"
-    tags: [server-version, "3.10", replica_set-noauth-nossl]
+    tags: [server-version, python-3.10, replica_set-noauth-nossl]
   - name: test-python3.12-auth-nossl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8255,7 +8255,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.12"
-    tags: [server-version, "3.12", sharded_cluster-auth-nossl]
+    tags: [server-version, python-3.12, sharded_cluster-auth-nossl]
   - name: test-python3.13-noauth-ssl-sharded-cluster-cov
     commands:
       - func: run server
@@ -8271,7 +8271,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           COVERAGE: "1"
           PYTHON_VERSION: "3.13"
-    tags: [server-version, "3.13", sharded_cluster-noauth-ssl]
+    tags: [server-version, python-3.13, sharded_cluster-noauth-ssl]
   - name: test-pypy3.10-noauth-nossl-sharded-cluster
     commands:
       - func: run server
@@ -8285,7 +8285,7 @@ tasks:
           SSL: nossl
           TOPOLOGY: sharded_cluster
           PYTHON_VERSION: pypy3.10
-    tags: [server-version, pypy3.10, sharded_cluster-noauth-nossl]
+    tags: [server-version, python-pypy3.10, sharded_cluster-noauth-nossl]
 
   # Serverless tests
   - name: test-serverless
@@ -8317,8 +8317,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-4.0
-      - "3.9"
+      - python-3.9
       - standalone-noauth-nossl
+      - sync
   - name: test-v4.2-python3.10-async-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8338,8 +8339,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-4.2
-      - "3.10"
+      - python-3.10
       - replica_set-noauth-ssl
+      - async
   - name: test-v4.4-python3.11-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8359,8 +8361,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-4.4
-      - "3.11"
+      - python-3.11
       - sharded_cluster-auth-ssl
+      - sync
   - name: test-v5.0-python3.12-async-noauth-nossl-standalone
     commands:
       - func: run server
@@ -8380,8 +8383,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-5.0
-      - "3.12"
+      - python-3.12
       - standalone-noauth-nossl
+      - async
   - name: test-v6.0-python3.13-sync-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8401,8 +8405,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-6.0
-      - "3.13"
+      - python-3.13
       - replica_set-noauth-ssl
+      - sync
   - name: test-v7.0-python3.9-async-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8422,8 +8427,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-7.0
-      - "3.9"
+      - python-3.9
       - sharded_cluster-auth-ssl
+      - async
   - name: test-v8.0-python3.10-sync-noauth-nossl-standalone
     commands:
       - func: run server
@@ -8443,8 +8449,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-8.0
-      - "3.10"
+      - python-3.10
       - standalone-noauth-nossl
+      - sync
   - name: test-rapid-python3.11-async-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -8464,8 +8471,9 @@ tasks:
     tags:
       - standard-non-linux
       - server-rapid
-      - "3.11"
+      - python-3.11
       - replica_set-noauth-ssl
+      - async
   - name: test-latest-python3.12-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -8485,5 +8493,6 @@ tasks:
     tags:
       - standard-non-linux
       - server-latest
-      - "3.12"
+      - python-3.12
       - sharded_cluster-auth-ssl
+      - sync
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index 892614d3d1..2ec1806798 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -591,7 +591,7 @@ def create_server_version_tasks():
             continue
         task_types.append((python, topology, auth, ssl))
     for python, topology, auth, ssl in task_types:
-        tags = ["server-version", python, f"{topology}-{auth}-{ssl}"]
+        tags = ["server-version", f"python-{python}", f"{topology}-{auth}-{ssl}"]
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
         if python not in PYPYS:
             expansions["COVERAGE"] = "1"
@@ -609,7 +609,13 @@ def create_standard_non_linux_tasks():
     for version, python, topology, sync in zip_cycle(ALL_VERSIONS, CPYTHONS, TOPOLOGIES, SYNCS):
         auth = "auth" if topology == "sharded_cluster" else "noauth"
         ssl = "nossl" if topology == "standalone" else "ssl"
-        tags = ["standard-non-linux", f"server-{version}", python, f"{topology}-{auth}-{ssl}"]
+        tags = [
+            "standard-non-linux",
+            f"server-{version}",
+            f"python-{python}",
+            f"{topology}-{auth}-{ssl}",
+            sync,
+        ]
         expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
         name = get_task_name("test", python=python, sync=sync, **expansions)
         server_func = FunctionCall(func="run server", vars=expansions)

From 8a2badb737d0f339330ae5125a7dcd7bdee5c624 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 10:54:41 -0500
Subject: [PATCH 08/12] fix win32 handling

---
 .evergreen/config.yml                 | 4 ++--
 .evergreen/scripts/generate_config.py | 3 +++
 .evergreen/utils.sh                   | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index a1d6284713..28f8bcfcca 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -66,7 +66,7 @@ functions:
       params:
         binary: bash
         working_dir: "src"
-        include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, PYTHON_VERSION,
+        include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, PYTHON_VERSION, IS_WIN32,
           STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER, LOCAL_ATLAS, NO_EXT]
         args: [.evergreen/just.sh, run-server, "${TEST_NAME}"]
     - command: expansions.update
@@ -87,7 +87,7 @@ functions:
       type: test
       params:
         include_expansions_in_env: [AUTH, SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
-          AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI, PYTHON_VERSION,
+          AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI, PYTHON_VERSION, IS_WIN32,
           DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS, MONGODB_API_VERSION, DEBUG_LOG,
           ORCHESTRATION_FILE, OCSP_SERVER_TYPE, VERSION, REQUIRE_FIPS]
         binary: bash
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index 2ec1806798..0b684a8e2a 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -91,6 +91,9 @@ def create_standard_nonlinux_variants() -> list[BuildVariant]:
             ]
         host = HOSTS[host_name]
         tags = ["standard-non-linux"]
+        expansions = dict()
+        if host_name == "win32":
+            expansions["IS_WIN32"] = "1"
         display_name = get_variant_name(base_display_name, host)
         variant = create_variant(tasks, display_name, host=host, tags=tags)
         variants.append(variant)
diff --git a/.evergreen/utils.sh b/.evergreen/utils.sh
index faecde05fd..354d18dbf7 100755
--- a/.evergreen/utils.sh
+++ b/.evergreen/utils.sh
@@ -123,7 +123,11 @@ get_python_binary() {
         PYTHON="/Library/Frameworks/Python.Framework/Versions/$version/bin/python3"
     elif [ "Windows_NT" = "${OS:-}" ]; then
         version=$(echo $version | cut -d. -f1,2 | sed 's/\.//g')
-        PYTHON="C:/python/Python$version/python.exe"
+        if [ -n "${IS_WIN32:-}" ]; then
+            PYTHON="C:/python/32/Python$version/python.exe"
+        else
+            PYTHON="C:/python/Python$version/python.exe"
+        fi
     else
         PYTHON="/opt/python/$version/bin/python3"
     fi

From ac80312843522e3279fe87a95e9ce8dbe8dd6dcd Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 10:55:42 -0500
Subject: [PATCH 09/12] fix TEST_NAME handling

---
 .evergreen/generated_configs/tasks.yml | 18 +++++++++---------
 .evergreen/scripts/generate_config.py  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index 57006d0736..99866dd49f 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -8313,7 +8313,7 @@ tasks:
           TOPOLOGY: standalone
           VERSION: "4.0"
           PYTHON_VERSION: "3.9"
-          TASK_NAME: default_sync
+          TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-4.0
@@ -8335,7 +8335,7 @@ tasks:
           TOPOLOGY: replica_set
           VERSION: "4.2"
           PYTHON_VERSION: "3.10"
-          TASK_NAME: default_async
+          TEST_NAME: default_async
     tags:
       - standard-non-linux
       - server-4.2
@@ -8357,7 +8357,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           VERSION: "4.4"
           PYTHON_VERSION: "3.11"
-          TASK_NAME: default_sync
+          TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-4.4
@@ -8379,7 +8379,7 @@ tasks:
           TOPOLOGY: standalone
           VERSION: "5.0"
           PYTHON_VERSION: "3.12"
-          TASK_NAME: default_async
+          TEST_NAME: default_async
     tags:
       - standard-non-linux
       - server-5.0
@@ -8401,7 +8401,7 @@ tasks:
           TOPOLOGY: replica_set
           VERSION: "6.0"
           PYTHON_VERSION: "3.13"
-          TASK_NAME: default_sync
+          TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-6.0
@@ -8423,7 +8423,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           VERSION: "7.0"
           PYTHON_VERSION: "3.9"
-          TASK_NAME: default_async
+          TEST_NAME: default_async
     tags:
       - standard-non-linux
       - server-7.0
@@ -8445,7 +8445,7 @@ tasks:
           TOPOLOGY: standalone
           VERSION: "8.0"
           PYTHON_VERSION: "3.10"
-          TASK_NAME: default_sync
+          TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-8.0
@@ -8467,7 +8467,7 @@ tasks:
           TOPOLOGY: replica_set
           VERSION: rapid
           PYTHON_VERSION: "3.11"
-          TASK_NAME: default_async
+          TEST_NAME: default_async
     tags:
       - standard-non-linux
       - server-rapid
@@ -8489,7 +8489,7 @@ tasks:
           TOPOLOGY: sharded_cluster
           VERSION: latest
           PYTHON_VERSION: "3.12"
-          TASK_NAME: default_sync
+          TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-latest
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index 0b684a8e2a..73a6321f25 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -624,7 +624,7 @@ def create_standard_non_linux_tasks():
         server_func = FunctionCall(func="run server", vars=expansions)
         test_vars = expansions.copy()
         test_vars["PYTHON_VERSION"] = python
-        test_vars["TASK_NAME"] = f"default_{sync}"
+        test_vars["TEST_NAME"] = f"default_{sync}"
         test_func = FunctionCall(func="run tests", vars=test_vars)
         tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
     return tasks

From 8071464cbb13d7abfd2a9739a2daa2c7a152fa70 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 11:07:52 -0500
Subject: [PATCH 10/12] include expansions

---
 .evergreen/generated_configs/variants.yml | 2 ++
 .evergreen/scripts/generate_config.py     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml
index 64ce3c5633..0ad366dbea 100644
--- a/.evergreen/generated_configs/variants.yml
+++ b/.evergreen/generated_configs/variants.yml
@@ -989,6 +989,8 @@ buildvariants:
     display_name: "* Test Win32"
     run_on:
       - windows-64-vsMulti-small
+    expansions:
+      IS_WIN32: "1"
     tags: [standard-non-linux]
 
   # Storage engine tests
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index 73a6321f25..fca4eff859 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -95,7 +95,7 @@ def create_standard_nonlinux_variants() -> list[BuildVariant]:
         if host_name == "win32":
             expansions["IS_WIN32"] = "1"
         display_name = get_variant_name(base_display_name, host)
-        variant = create_variant(tasks, display_name, host=host, tags=tags)
+        variant = create_variant(tasks, display_name, host=host, tags=tags, expansions=expansions)
         variants.append(variant)
 
     return variants

From 35cbb0d1194ff8d7306046c36ac56eaa606d9620 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 12:06:32 -0500
Subject: [PATCH 11/12] fix IS_WIN32 handling

---
 .evergreen/scripts/setup_tests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.evergreen/scripts/setup_tests.py b/.evergreen/scripts/setup_tests.py
index 2fa1fc47fc..9b657507c1 100644
--- a/.evergreen/scripts/setup_tests.py
+++ b/.evergreen/scripts/setup_tests.py
@@ -34,6 +34,7 @@
     "PYTHON_BINARY",
     "PYTHON_VERSION",
     "REQUIRE_FIPS",
+    "IS_WIN32",
 ]
 
 # Map the test name to test extra.

From 774ca3d8b409418760f41a96437c90ddc79dcb3c Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Thu, 10 Apr 2025 12:08:17 -0500
Subject: [PATCH 12/12] all topologies per version

---
 .evergreen/generated_configs/tasks.yml | 436 +++++++++++++++++++++++--
 .evergreen/scripts/generate_config.py  |   5 +-
 2 files changed, 420 insertions(+), 21 deletions(-)

diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index 99866dd49f..8d80b113a3 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -8320,29 +8320,161 @@ tasks:
       - python-3.9
       - standalone-noauth-nossl
       - sync
-  - name: test-v4.2-python3.10-async-noauth-ssl-replica-set
+  - name: test-v4.0-python3.10-async-noauth-ssl-replica-set
     commands:
       - func: run server
         vars:
           AUTH: noauth
           SSL: ssl
           TOPOLOGY: replica_set
+          VERSION: "4.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "4.0"
+          PYTHON_VERSION: "3.10"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-4.0
+      - python-3.10
+      - replica_set-noauth-ssl
+      - async
+  - name: test-v4.0-python3.11-sync-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "4.0"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "4.0"
+          PYTHON_VERSION: "3.11"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-4.0
+      - python-3.11
+      - sharded_cluster-auth-ssl
+      - sync
+  - name: test-v4.2-python3.12-async-noauth-nossl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
           VERSION: "4.2"
       - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: "4.2"
+          PYTHON_VERSION: "3.12"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-4.2
+      - python-3.12
+      - standalone-noauth-nossl
+      - async
+  - name: test-v4.2-python3.13-sync-noauth-ssl-replica-set
+    commands:
+      - func: run server
         vars:
           AUTH: noauth
           SSL: ssl
           TOPOLOGY: replica_set
           VERSION: "4.2"
-          PYTHON_VERSION: "3.10"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "4.2"
+          PYTHON_VERSION: "3.13"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-4.2
+      - python-3.13
+      - replica_set-noauth-ssl
+      - sync
+  - name: test-v4.2-python3.9-async-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "4.2"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "4.2"
+          PYTHON_VERSION: "3.9"
           TEST_NAME: default_async
     tags:
       - standard-non-linux
       - server-4.2
+      - python-3.9
+      - sharded_cluster-auth-ssl
+      - async
+  - name: test-v4.4-python3.10-sync-noauth-nossl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: "4.4"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: "4.4"
+          PYTHON_VERSION: "3.10"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-4.4
       - python-3.10
+      - standalone-noauth-nossl
+      - sync
+  - name: test-v4.4-python3.11-async-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "4.4"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "4.4"
+          PYTHON_VERSION: "3.11"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-4.4
+      - python-3.11
       - replica_set-noauth-ssl
       - async
-  - name: test-v4.4-python3.11-sync-auth-ssl-sharded-cluster
+  - name: test-v4.4-python3.12-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
@@ -8356,15 +8488,15 @@ tasks:
           SSL: ssl
           TOPOLOGY: sharded_cluster
           VERSION: "4.4"
-          PYTHON_VERSION: "3.11"
+          PYTHON_VERSION: "3.12"
           TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-4.4
-      - python-3.11
+      - python-3.12
       - sharded_cluster-auth-ssl
       - sync
-  - name: test-v5.0-python3.12-async-noauth-nossl-standalone
+  - name: test-v5.0-python3.13-async-noauth-nossl-standalone
     commands:
       - func: run server
         vars:
@@ -8378,15 +8510,81 @@ tasks:
           SSL: nossl
           TOPOLOGY: standalone
           VERSION: "5.0"
-          PYTHON_VERSION: "3.12"
+          PYTHON_VERSION: "3.13"
           TEST_NAME: default_async
     tags:
       - standard-non-linux
       - server-5.0
-      - python-3.12
+      - python-3.13
       - standalone-noauth-nossl
       - async
-  - name: test-v6.0-python3.13-sync-noauth-ssl-replica-set
+  - name: test-v5.0-python3.9-sync-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "5.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "5.0"
+          PYTHON_VERSION: "3.9"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-5.0
+      - python-3.9
+      - replica_set-noauth-ssl
+      - sync
+  - name: test-v5.0-python3.10-async-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "5.0"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "5.0"
+          PYTHON_VERSION: "3.10"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-5.0
+      - python-3.10
+      - sharded_cluster-auth-ssl
+      - async
+  - name: test-v6.0-python3.11-sync-noauth-nossl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: "6.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: "6.0"
+          PYTHON_VERSION: "3.11"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-6.0
+      - python-3.11
+      - standalone-noauth-nossl
+      - sync
+  - name: test-v6.0-python3.12-async-noauth-ssl-replica-set
     commands:
       - func: run server
         vars:
@@ -8400,15 +8598,81 @@ tasks:
           SSL: ssl
           TOPOLOGY: replica_set
           VERSION: "6.0"
+          PYTHON_VERSION: "3.12"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-6.0
+      - python-3.12
+      - replica_set-noauth-ssl
+      - async
+  - name: test-v6.0-python3.13-sync-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "6.0"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "6.0"
           PYTHON_VERSION: "3.13"
           TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-6.0
       - python-3.13
+      - sharded_cluster-auth-ssl
+      - sync
+  - name: test-v7.0-python3.9-async-noauth-nossl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: "7.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: "7.0"
+          PYTHON_VERSION: "3.9"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-7.0
+      - python-3.9
+      - standalone-noauth-nossl
+      - async
+  - name: test-v7.0-python3.10-sync-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "7.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "7.0"
+          PYTHON_VERSION: "3.10"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-7.0
+      - python-3.10
       - replica_set-noauth-ssl
       - sync
-  - name: test-v7.0-python3.9-async-auth-ssl-sharded-cluster
+  - name: test-v7.0-python3.11-async-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
@@ -8422,15 +8686,15 @@ tasks:
           SSL: ssl
           TOPOLOGY: sharded_cluster
           VERSION: "7.0"
-          PYTHON_VERSION: "3.9"
+          PYTHON_VERSION: "3.11"
           TEST_NAME: default_async
     tags:
       - standard-non-linux
       - server-7.0
-      - python-3.9
+      - python-3.11
       - sharded_cluster-auth-ssl
       - async
-  - name: test-v8.0-python3.10-sync-noauth-nossl-standalone
+  - name: test-v8.0-python3.12-sync-noauth-nossl-standalone
     commands:
       - func: run server
         vars:
@@ -8444,15 +8708,81 @@ tasks:
           SSL: nossl
           TOPOLOGY: standalone
           VERSION: "8.0"
-          PYTHON_VERSION: "3.10"
+          PYTHON_VERSION: "3.12"
           TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-8.0
-      - python-3.10
+      - python-3.12
       - standalone-noauth-nossl
       - sync
-  - name: test-rapid-python3.11-async-noauth-ssl-replica-set
+  - name: test-v8.0-python3.13-async-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "8.0"
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: "8.0"
+          PYTHON_VERSION: "3.13"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-8.0
+      - python-3.13
+      - replica_set-noauth-ssl
+      - async
+  - name: test-v8.0-python3.9-sync-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "8.0"
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: "8.0"
+          PYTHON_VERSION: "3.9"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-8.0
+      - python-3.9
+      - sharded_cluster-auth-ssl
+      - sync
+  - name: test-rapid-python3.10-async-noauth-nossl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: rapid
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: rapid
+          PYTHON_VERSION: "3.10"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-rapid
+      - python-3.10
+      - standalone-noauth-nossl
+      - async
+  - name: test-rapid-python3.11-sync-noauth-ssl-replica-set
     commands:
       - func: run server
         vars:
@@ -8467,14 +8797,80 @@ tasks:
           TOPOLOGY: replica_set
           VERSION: rapid
           PYTHON_VERSION: "3.11"
-          TEST_NAME: default_async
+          TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-rapid
       - python-3.11
       - replica_set-noauth-ssl
+      - sync
+  - name: test-rapid-python3.12-async-auth-ssl-sharded-cluster
+    commands:
+      - func: run server
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: rapid
+      - func: run tests
+        vars:
+          AUTH: auth
+          SSL: ssl
+          TOPOLOGY: sharded_cluster
+          VERSION: rapid
+          PYTHON_VERSION: "3.12"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-rapid
+      - python-3.12
+      - sharded_cluster-auth-ssl
+      - async
+  - name: test-latest-python3.13-sync-noauth-nossl-standalone
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: latest
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: nossl
+          TOPOLOGY: standalone
+          VERSION: latest
+          PYTHON_VERSION: "3.13"
+          TEST_NAME: default_sync
+    tags:
+      - standard-non-linux
+      - server-latest
+      - python-3.13
+      - standalone-noauth-nossl
+      - sync
+  - name: test-latest-python3.9-async-noauth-ssl-replica-set
+    commands:
+      - func: run server
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: latest
+      - func: run tests
+        vars:
+          AUTH: noauth
+          SSL: ssl
+          TOPOLOGY: replica_set
+          VERSION: latest
+          PYTHON_VERSION: "3.9"
+          TEST_NAME: default_async
+    tags:
+      - standard-non-linux
+      - server-latest
+      - python-3.9
+      - replica_set-noauth-ssl
       - async
-  - name: test-latest-python3.12-sync-auth-ssl-sharded-cluster
+  - name: test-latest-python3.10-sync-auth-ssl-sharded-cluster
     commands:
       - func: run server
         vars:
@@ -8488,11 +8884,11 @@ tasks:
           SSL: ssl
           TOPOLOGY: sharded_cluster
           VERSION: latest
-          PYTHON_VERSION: "3.12"
+          PYTHON_VERSION: "3.10"
           TEST_NAME: default_sync
     tags:
       - standard-non-linux
       - server-latest
-      - python-3.12
+      - python-3.10
       - sharded_cluster-auth-ssl
       - sync
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index fca4eff859..1aea20c8f3 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -609,7 +609,10 @@ def create_server_version_tasks():
 
 def create_standard_non_linux_tasks():
     tasks = []
-    for version, python, topology, sync in zip_cycle(ALL_VERSIONS, CPYTHONS, TOPOLOGIES, SYNCS):
+
+    for (version, topology), python, sync in zip_cycle(
+        list(product(ALL_VERSIONS, TOPOLOGIES)), CPYTHONS, SYNCS
+    ):
         auth = "auth" if topology == "sharded_cluster" else "noauth"
         ssl = "nossl" if topology == "standalone" else "ssl"
         tags = [