diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ce64932963..d2d382cf17 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -577,8 +577,6 @@ functions: working_dir: src/go.mongodb.org/mongo-driver script: | ${PREPARE_SHELL} - - IS_SERVERLESS_PROXY="${IS_SERVERLESS_PROXY}" \ bash etc/run-serverless-test.sh run-atlas-data-lake-test: @@ -2179,17 +2177,6 @@ axes: variables: GO_DIST: "/opt/golang/go1.20" - - id: serverless-type - display_name: "Serverless Type" - values: - - id: "original" - display_name: "Serverless" - - id: "proxy" - display_name: "Serverless Proxy" - variables: - VAULT_NAME: "serverless_next" - IS_SERVERLESS_PROXY: "true" - task_groups: - name: serverless_task_group setup_group_can_fail_task: true @@ -2663,14 +2650,8 @@ buildvariants: - matrix_name: "serverless" tags: ["pullrequest"] - matrix_spec: { os-serverless: "*", serverless-type: "original" } - display_name: "${serverless-type} ${os-serverless}" - tasks: - - "serverless_task_group" - - - matrix_name: "serverless-proxy" - matrix_spec: { os-serverless: "*", serverless-type: "proxy" } - display_name: "${serverless-type} ${os-serverless}" + matrix_spec: { os-serverless: "*" } + display_name: "Serverless ${os-serverless}" tasks: - "serverless_task_group" diff --git a/etc/run-serverless-test.sh b/etc/run-serverless-test.sh index 95c7d28ff3..9d858a0610 100644 --- a/etc/run-serverless-test.sh +++ b/etc/run-serverless-test.sh @@ -5,7 +5,6 @@ source ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh AUTH="auth" \ SSL="ssl" \ MONGODB_URI="${SERVERLESS_URI}" \ - IS_SERVERLESS_PROXY="${IS_SERVERLESS_PROXY}" \ SERVERLESS="serverless" \ MAKEFILE_TARGET=evg-test-serverless \ sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh diff --git a/mongo/integration/unified/unified_spec_runner.go b/mongo/integration/unified/unified_spec_runner.go index a2f1b8c102..41628d0c6c 100644 --- a/mongo/integration/unified/unified_spec_runner.go +++ b/mongo/integration/unified/unified_spec_runner.go @@ -10,7 +10,6 @@ import ( "context" "fmt" "io/ioutil" - "os" "path" "strings" "testing" @@ -69,10 +68,6 @@ var ( "operation is retried multiple times for non-zero timeoutMS - aggregate on database": "maxTimeMS is disabled on find and aggregate. See DRIVERS-2722.", } - skippedServerlessProxyTests = map[string]string{ - "errors during the initial connection hello are ignored": "Serverless Proxy does not support failpoints on hello (see GODRIVER-3157)", - } - logMessageValidatorTimeout = 10 * time.Millisecond lowHeartbeatFrequency = 50 * time.Millisecond ) @@ -256,11 +251,6 @@ func (tc *TestCase) Run(ls LoggerSkipper) error { if skipReason, ok := skippedTests[tc.Description]; ok { ls.Skipf("skipping due to known failure: %q", skipReason) } - // If we're running against a Serverless Proxy instance, also check the - // tests that should be skipped only for Serverless Proxy. - if skipReason, ok := skippedServerlessProxyTests[tc.Description]; ok && os.Getenv("IS_SERVERLESS_PROXY") == "true" { - ls.Skipf("skipping due to known failure with Serverless Proxy: %q", skipReason) - } // Validate that we support the schema declared by the test file before attempting to use its contents. if err := checkSchemaVersion(tc.schemaVersion); err != nil {