undo changes to config

Author: blink1073

.evergreen/generated_configs/variants.yml

@@ -1285,97 +1285,3 @@ buildvariants:
       AUTH: auth
       SSL: ssl
       PYTHON_BINARY: /opt/python/3.13/bin/python3
-
-  # Storage engine tests
-  - name: storage-inmemory-rhel8-py3.9
-    tasks:
-      - name: .standalone .noauth .nossl .4.0 .sync_async
-      - name: .standalone .noauth .nossl .4.4 .sync_async
-      - name: .standalone .noauth .nossl .5.0 .sync_async
-      - name: .standalone .noauth .nossl .6.0 .sync_async
-      - name: .standalone .noauth .nossl .7.0 .sync_async
-      - name: .standalone .noauth .nossl .8.0 .sync_async
-      - name: .standalone .noauth .nossl .rapid .sync_async
-      - name: .standalone .noauth .nossl .latest .sync_async
-    display_name: Storage InMemory RHEL8 py3.9
-    run_on:
-      - rhel87-small
-    expansions:
-      STORAGE_ENGINE: inmemory
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-  - name: storage-mmapv1-rhel8-py3.9
-    tasks:
-      - name: .standalone .4.0 .noauth .nossl .sync_async
-      - name: .replica_set .4.0 .noauth .nossl .sync_async
-    display_name: Storage MMAPv1 RHEL8 py3.9
-    run_on:
-      - rhel87-small
-    expansions:
-      STORAGE_ENGINE: mmapv1
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-
-  # Versioned api tests
-  - name: versioned-api-require-v1-rhel8-py3.9-auth
-    tasks:
-      - name: .5.0 .auth .ssl .sync_async
-      - name: .6.0 .auth .ssl .sync_async
-      - name: .7.0 .auth .ssl .sync_async
-      - name: .8.0 .auth .ssl .sync_async
-      - name: .rapid .auth .ssl .sync_async
-      - name: .latest .auth .ssl .sync_async
-    display_name: Versioned API require v1 RHEL8 py3.9 Auth
-    run_on:
-      - rhel87-small
-    expansions:
-      AUTH: auth
-      REQUIRE_API_VERSION: "1"
-      MONGODB_API_VERSION: "1"
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-    tags: [versionedApi_tag]
-  - name: versioned-api-require-v1-rhel8-py3.13-auth
-    tasks:
-      - name: .5.0 .auth .ssl .sync_async
-      - name: .6.0 .auth .ssl .sync_async
-      - name: .7.0 .auth .ssl .sync_async
-      - name: .8.0 .auth .ssl .sync_async
-      - name: .rapid .auth .ssl .sync_async
-      - name: .latest .auth .ssl .sync_async
-    display_name: Versioned API require v1 RHEL8 py3.13 Auth
-    run_on:
-      - rhel87-small
-    expansions:
-      AUTH: auth
-      REQUIRE_API_VERSION: "1"
-      MONGODB_API_VERSION: "1"
-      PYTHON_BINARY: /opt/python/3.13/bin/python3
-    tags: [versionedApi_tag]
-  - name: versioned-api-accept-v2-rhel8-py3.9
-    tasks:
-      - name: .5.0 .noauth .nossl .sync_async
-      - name: .6.0 .noauth .nossl .sync_async
-      - name: .7.0 .noauth .nossl .sync_async
-      - name: .8.0 .noauth .nossl .sync_async
-      - name: .rapid .noauth .nossl .sync_async
-      - name: .latest .noauth .nossl .sync_async
-    display_name: Versioned API accept v2 RHEL8 py3.9
-    run_on:
-      - rhel87-small
-    expansions:
-      ORCHESTRATION_FILE: versioned-api-testing.json
-      PYTHON_BINARY: /opt/python/3.9/bin/python3
-    tags: [versionedApi_tag]
-  - name: versioned-api-accept-v2-rhel8-py3.13
-    tasks:
-      - name: .5.0 .noauth .nossl .sync_async
-      - name: .6.0 .noauth .nossl .sync_async
-      - name: .7.0 .noauth .nossl .sync_async
-      - name: .8.0 .noauth .nossl .sync_async
-      - name: .rapid .noauth .nossl .sync_async
-      - name: .latest .noauth .nossl .sync_async
-    display_name: Versioned API accept v2 RHEL8 py3.13
-    run_on:
-      - rhel87-small
-    expansions:
-      ORCHESTRATION_FILE: versioned-api-testing.json
-      PYTHON_BINARY: /opt/python/3.13/bin/python3
-    tags: [versionedApi_tag]

.evergreen/scripts/generate_config.py

@@ -467,7 +467,7 @@ def create_pyopenssl_variants():
     return variants
 
 
-def create_storage_engine_variants():
+def create_storage_engine_tests():
     host = "rhel8"
     engines = ["InMemory", "MMAPv1"]
     variants = []
@@ -490,34 +490,29 @@ def create_storage_engine_variants():
     return variants
 
 
-def create_versioned_api_variants():
+def create_versioned_api_tests():
     host = "rhel8"
     tags = ["versionedApi_tag"]
+    tasks = [f".standalone .{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")]
     variants = []
+    types = ["require v1", "accept v2"]
 
-    for python in MIN_MAX_PYTHON:
+    # All python versions across platforms.
+    for python, test_type in product(MIN_MAX_PYTHON, types):
         expansions = dict(AUTH="auth")
-        tasks = [f".{v} .auth .ssl .sync_async" for v in get_versions_from("5.0")]
-        # REQUIRE_API_VERSION is set to make drivers-evergreen-tools
-        # start a cluster with the requireApiVersion parameter.
-        expansions["REQUIRE_API_VERSION"] = "1"
-        # MONGODB_API_VERSION is the apiVersion to use in the test suite.
-        expansions["MONGODB_API_VERSION"] = "1"
-        base_display_name = "Versioned API require v1"
-        display_name = get_display_name(base_display_name, host, python=python, **expansions)
-        variant = create_variant(
-            tasks, display_name, host=host, python=python, tags=tags, expansions=expansions
-        )
-        variants.append(variant)
-
-    for python in MIN_MAX_PYTHON:
-        expansions = dict()
-        tasks = [f".{v} .noauth .nossl .sync_async" for v in get_versions_from("5.0")]
-        # Test against a cluster with acceptApiVersion2 but without
-        # requireApiVersion, and don't automatically add apiVersion to
-        # clients created in the test suite.
-        expansions["ORCHESTRATION_FILE"] = "versioned-api-testing.json"
-        base_display_name = "Versioned API accept v2"
+        # Test against a cluster with requireApiVersion=1.
+        if test_type == types[0]:
+            # REQUIRE_API_VERSION is set to make drivers-evergreen-tools
+            # start a cluster with the requireApiVersion parameter.
+            expansions["REQUIRE_API_VERSION"] = "1"
+            # MONGODB_API_VERSION is the apiVersion to use in the test suite.
+            expansions["MONGODB_API_VERSION"] = "1"
+        else:
+            # Test against a cluster with acceptApiVersion2 but without
+            # requireApiVersion, and don't automatically add apiVersion to
+            # clients created in the test suite.
+            expansions["ORCHESTRATION_FILE"] = "versioned-api-testing.json"
+        base_display_name = f"Versioned API {test_type}"
         display_name = get_display_name(base_display_name, host, python=python, **expansions)
         variant = create_variant(
             tasks, display_name, host=host, python=python, tags=tags, expansions=expansions