Skip to content

Commit fd6407e

Browse files
jyeminstIncMale
authored andcommitted
Update serverless testing for load balancer fronting single proxy
JAVA-4385
1 parent 484f1c0 commit fd6407e

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.evergreen/.evg.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,7 @@ functions:
251251
script: |
252252
${PREPARE_SHELL}
253253
JAVA_VERSION="${JAVA_VERSION}" \
254-
SINGLE_ATLASPROXY_SERVERLESS_URI="${SINGLE_ATLASPROXY_SERVERLESS_URI}" \
255-
MULTI_ATLASPROXY_SERVERLESS_URI="${MULTI_ATLASPROXY_SERVERLESS_URI}" \
254+
SERVERLESS_URI="${SERVERLESS_URI}" \
256255
SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}" \
257256
SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}" \
258257
.evergreen/run-serverless-tests.sh

.evergreen/run-serverless-tests.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
set -o errexit # Exit the script with error if any of the commands fail
55

66
# Supported/used environment variables:
7-
# JDK Set the version of java to be used. Java versions can be set from the java toolchain /opt/java
8-
# MONGODB_URI The URI, without credentials
7+
# JAVA_VERSION Set the version of java to be used
8+
# SERVERLESS_URI The URI, without credentials
99
# SERVERLESS_ATLAS_USER
1010
# SERVERLESS_ATLAS_PASSWORD
1111
# Support arguments:
@@ -19,11 +19,10 @@ RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
1919

2020
echo "Running serverless tests with Java ${JAVA_VERSION}"
2121

22-
# assume "mongodb" protocol for single server, and "mongodb+srv" protocol for multi server
23-
SINGLE_SERVER_URI="mongodb://${SERVERLESS_ATLAS_USER}:${SERVERLESS_ATLAS_PASSWORD}@${SINGLE_ATLASPROXY_SERVERLESS_URI:10}"
24-
MULTI_SERVER_URI="mongodb+srv://${SERVERLESS_ATLAS_USER}:${SERVERLESS_ATLAS_PASSWORD}@${MULTI_ATLASPROXY_SERVERLESS_URI:14}"
22+
# Assume "mongodb+srv" protocol
23+
MONGODB_URI="mongodb+srv://${SERVERLESS_ATLAS_USER}:${SERVERLESS_ATLAS_PASSWORD}@${SERVERLESS_URI:14}"
2524

2625
./gradlew -version
2726

28-
./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.uri=${SINGLE_SERVER_URI} -Dorg.mongodb.test.multi.mongos.uri=${MULTI_SERVER_URI} \
27+
./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.uri=${MONGODB_URI} \
2928
-Dorg.mongodb.test.serverless=true --stacktrace --info --continue driver-sync:test

0 commit comments

Comments
 (0)