From 819744c43d9609b36edfc167d17a37e2e8ce1058 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Wed, 4 Dec 2024 09:40:19 -0700
Subject: [PATCH] asdf

---
 .../unified/commit-retry.json                   |  5 -----
 .../unified/commit-retry.yml                    |  3 ---
 .../unified/commit-writeconcernerror.json       | 17 +----------------
 .../unified/commit-writeconcernerror.yml        | 11 +----------
 .../transactions/unified/retryable-commit.json  |  5 -----
 .../transactions/unified/retryable-commit.yml   |  3 ---
 6 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/test/spec/transactions-convenient-api/unified/commit-retry.json b/test/spec/transactions-convenient-api/unified/commit-retry.json
index cc802011673..928f0167e47 100644
--- a/test/spec/transactions-convenient-api/unified/commit-retry.json
+++ b/test/spec/transactions-convenient-api/unified/commit-retry.json
@@ -422,11 +422,6 @@
     },
     {
       "description": "commit is not retried after MaxTimeMSExpired error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/test/spec/transactions-convenient-api/unified/commit-retry.yml b/test/spec/transactions-convenient-api/unified/commit-retry.yml
index 63ff0f30be3..22d2125485f 100644
--- a/test/spec/transactions-convenient-api/unified/commit-retry.yml
+++ b/test/spec/transactions-convenient-api/unified/commit-retry.yml
@@ -212,9 +212,6 @@ tests:
           - { _id: 1 }
   -
     description: commit is not retried after MaxTimeMSExpired error
-    runOnRequirements:
-      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
-      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
diff --git a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json
index a455a450bff..a6f6e6bd7fa 100644
--- a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json
+++ b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.json
@@ -1,6 +1,6 @@
 {
   "description": "commit-writeconcernerror",
-  "schemaVersion": "1.4",
+  "schemaVersion": "1.3",
   "runOnRequirements": [
     {
       "minServerVersion": "4.0",
@@ -414,11 +414,6 @@
     },
     {
       "description": "commitTransaction is not retried after UnknownReplWriteConcern error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
@@ -551,11 +546,6 @@
     },
     {
       "description": "commitTransaction is not retried after UnsatisfiableWriteConcern error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
@@ -688,11 +678,6 @@
     },
     {
       "description": "commitTransaction is not retried after MaxTimeMSExpired error",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "name": "failPoint",
diff --git a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml
index a4a80839a34..44877fa008f 100644
--- a/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml
+++ b/test/spec/transactions-convenient-api/unified/commit-writeconcernerror.yml
@@ -1,6 +1,6 @@
 description: commit-writeconcernerror
 
-schemaVersion: '1.4' # For `serverless` in `runOnRequirements`
+schemaVersion: '1.3'
 
 runOnRequirements:
   - minServerVersion: '4.0'
@@ -151,9 +151,6 @@ tests:
     outcome: *outcome
   -
     description: commitTransaction is not retried after UnknownReplWriteConcern error
-    runOnRequirements:
-      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
-      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -206,9 +203,6 @@ tests:
     outcome: *outcome
   -
     description: commitTransaction is not retried after UnsatisfiableWriteConcern error
-    runOnRequirements:
-      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
-      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
@@ -232,9 +226,6 @@ tests:
     outcome: *outcome
   -
     description: commitTransaction is not retried after MaxTimeMSExpired error
-    runOnRequirements:
-      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
-      - serverless: forbid
     operations:
       - name: failPoint
         object: testRunner
diff --git a/test/spec/transactions/unified/retryable-commit.json b/test/spec/transactions/unified/retryable-commit.json
index 7d7e52495d8..b794c1c55c9 100644
--- a/test/spec/transactions/unified/retryable-commit.json
+++ b/test/spec/transactions/unified/retryable-commit.json
@@ -89,11 +89,6 @@
   "tests": [
     {
       "description": "commitTransaction fails after Interrupted",
-      "runOnRequirements": [
-        {
-          "serverless": "forbid"
-        }
-      ],
       "operations": [
         {
           "object": "testRunner",
diff --git a/test/spec/transactions/unified/retryable-commit.yml b/test/spec/transactions/unified/retryable-commit.yml
index ed0f64978d5..916944065a7 100644
--- a/test/spec/transactions/unified/retryable-commit.yml
+++ b/test/spec/transactions/unified/retryable-commit.yml
@@ -67,9 +67,6 @@ initialData:
 tests:
   -
     description: 'commitTransaction fails after Interrupted'
-    runOnRequirements:
-      # Serverless sets empty `codeName` on failpoint errors. Remove once CLOUDP-280424 is fixed.
-      - serverless: forbid
     operations:
       -
         object: testRunner