From f967b7f2e3536bd4fce1f00368d131d6629dd4d3 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 23 Jul 2024 12:55:38 -0500
Subject: [PATCH 1/2] PYTHON-4551 Remove Serverless Proxy Incremental Rollout
 Tests

---
 .evergreen/config.yml  | 22 +---------------------
 test/unified_format.py |  7 -------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index f085253541..3c3ccd6b01 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -432,9 +432,6 @@ functions:
           if [ -n "${test_serverless}" ]; then
             export TEST_SERVERLESS=1
           fi
-          if [ -n "${IS_SERVERLESS_PROXY}" ]; then
-            export IS_SERVERLESS_PROXY=1
-          fi
           if [ -n "${TEST_INDEX_MANAGEMENT}" ]; then
             export TEST_INDEX_MANAGEMENT=1
           fi
@@ -2600,18 +2597,11 @@ axes:
   - id: serverless
     display_name: "Serverless"
     values:
-      - id: "original"
+      - id: "enabled"
         display_name: "Serverless"
         variables:
           test_serverless: true
         batchtime: 10080  # 7 days
-      - id: "proxy"
-        display_name: "Serverless Proxy"
-        variables:
-          test_serverless: true
-          VAULT_NAME: "serverless_next"
-          IS_SERVERLESS_PROXY: true
-        batchtime: 10080  # 7 days
 
 buildvariants:
 - matrix_name: "tests-fips"
@@ -3017,16 +3007,6 @@ buildvariants:
   tasks:
     - "serverless_task_group"
 
-- matrix_name: "serverless_proxy"
-  matrix_spec:
-    platform: rhel8
-    python-version: ["3.8", "3.10"]
-    auth-ssl: auth-ssl
-    serverless: "proxy"
-  display_name: "${serverless} ${python-version} ${platform}"
-  tasks:
-    - "serverless_task_group"
-
 - matrix_name: "data-lake-spec-tests"
   matrix_spec:
     platform: ubuntu-22.04
diff --git a/test/unified_format.py b/test/unified_format.py
index cb97653b03..90f36c4a77 100644
--- a/test/unified_format.py
+++ b/test/unified_format.py
@@ -1048,7 +1048,6 @@ def setUp(self):
 
         # initialize internals
         self.match_evaluator = MatchEvaluatorUtil(self)
-        self.IS_SERVERLESS_PROXY = os.environ.get("IS_SERVERLESS_PROXY")
 
     def maybe_skip_test(self, spec):
         # add any special-casing for skipping tests here
@@ -1075,12 +1074,6 @@ def maybe_skip_test(self, spec):
         if "unpin after non-transient error on abort" in spec["description"]:
             if client_context.version[0] == 8:
                 self.skipTest("Skipping TransientTransactionError pending PYTHON-4182")
-        if self.IS_SERVERLESS_PROXY is not None and (
-            "errors during the initial connection hello are ignored" in spec["description"]
-            or "pinned connection is released after a transient network commit error"
-            in spec["description"]
-        ):
-            self.skipTest("waiting on CLOUDP-202309")
 
         class_name = self.__class__.__name__.lower()
         description = spec["description"].lower()

From 0a7d1276d6b467c9c406de3d96126412819b8262 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 23 Jul 2024 12:56:39 -0500
Subject: [PATCH 2/2] fix config

---
 .evergreen/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 3c3ccd6b01..34e9d33d5f 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -3002,7 +3002,7 @@ buildvariants:
     platform: rhel8
     python-version: "*"
     auth-ssl: auth-ssl
-    serverless: "original"
+    serverless: "enabled"
   display_name: "${serverless} ${python-version} ${platform}"
   tasks:
     - "serverless_task_group"