Skip to content

Commit 05a64e7

Browse files
authored
GODRIVER-3272 Remove Serverless Proxy Incremental Rollout Tests (#1710)
1 parent 7c5046d commit 05a64e7

File tree

3 files changed

+2
-32
lines changed

3 files changed

+2
-32
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,6 @@ functions:
577577
working_dir: src/go.mongodb.org/mongo-driver
578578
script: |
579579
${PREPARE_SHELL}
580-
581-
IS_SERVERLESS_PROXY="${IS_SERVERLESS_PROXY}" \
582580
bash etc/run-serverless-test.sh
583581
584582
run-atlas-data-lake-test:
@@ -2179,17 +2177,6 @@ axes:
21792177
variables:
21802178
GO_DIST: "/opt/golang/go1.20"
21812179

2182-
- id: serverless-type
2183-
display_name: "Serverless Type"
2184-
values:
2185-
- id: "original"
2186-
display_name: "Serverless"
2187-
- id: "proxy"
2188-
display_name: "Serverless Proxy"
2189-
variables:
2190-
VAULT_NAME: "serverless_next"
2191-
IS_SERVERLESS_PROXY: "true"
2192-
21932180
task_groups:
21942181
- name: serverless_task_group
21952182
setup_group_can_fail_task: true
@@ -2663,14 +2650,8 @@ buildvariants:
26632650

26642651
- matrix_name: "serverless"
26652652
tags: ["pullrequest"]
2666-
matrix_spec: { os-serverless: "*", serverless-type: "original" }
2667-
display_name: "${serverless-type} ${os-serverless}"
2668-
tasks:
2669-
- "serverless_task_group"
2670-
2671-
- matrix_name: "serverless-proxy"
2672-
matrix_spec: { os-serverless: "*", serverless-type: "proxy" }
2673-
display_name: "${serverless-type} ${os-serverless}"
2653+
matrix_spec: { os-serverless: "*" }
2654+
display_name: "Serverless ${os-serverless}"
26742655
tasks:
26752656
- "serverless_task_group"
26762657

etc/run-serverless-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ source ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh
55
AUTH="auth" \
66
SSL="ssl" \
77
MONGODB_URI="${SERVERLESS_URI}" \
8-
IS_SERVERLESS_PROXY="${IS_SERVERLESS_PROXY}" \
98
SERVERLESS="serverless" \
109
MAKEFILE_TARGET=evg-test-serverless \
1110
sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh

mongo/integration/unified/unified_spec_runner.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"context"
1111
"fmt"
1212
"io/ioutil"
13-
"os"
1413
"path"
1514
"strings"
1615
"testing"
@@ -69,10 +68,6 @@ var (
6968
"operation is retried multiple times for non-zero timeoutMS - aggregate on database": "maxTimeMS is disabled on find and aggregate. See DRIVERS-2722.",
7069
}
7170

72-
skippedServerlessProxyTests = map[string]string{
73-
"errors during the initial connection hello are ignored": "Serverless Proxy does not support failpoints on hello (see GODRIVER-3157)",
74-
}
75-
7671
logMessageValidatorTimeout = 10 * time.Millisecond
7772
lowHeartbeatFrequency = 50 * time.Millisecond
7873
)
@@ -256,11 +251,6 @@ func (tc *TestCase) Run(ls LoggerSkipper) error {
256251
if skipReason, ok := skippedTests[tc.Description]; ok {
257252
ls.Skipf("skipping due to known failure: %q", skipReason)
258253
}
259-
// If we're running against a Serverless Proxy instance, also check the
260-
// tests that should be skipped only for Serverless Proxy.
261-
if skipReason, ok := skippedServerlessProxyTests[tc.Description]; ok && os.Getenv("IS_SERVERLESS_PROXY") == "true" {
262-
ls.Skipf("skipping due to known failure with Serverless Proxy: %q", skipReason)
263-
}
264254

265255
// Validate that we support the schema declared by the test file before attempting to use its contents.
266256
if err := checkSchemaVersion(tc.schemaVersion); err != nil {

0 commit comments

Comments
 (0)