Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .evergreen/.evg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2430,18 +2430,27 @@ buildvariants:
- name: "socket-test-task"

- matrix_name: "tests-netty"
matrix_spec: { auth: "noauth", ssl: "*", jdk: "jdk8", version: [ "7.0" ], topology: "replicaset", os: "linux",
matrix_spec: { auth: "noauth", ssl: "*", jdk: "jdk8", version: [ "8.0" ], topology: "replicaset", os: "linux",
async-transport: "netty" }
display_name: "Netty: ${version} ${topology} ${ssl} ${auth} ${jdk} ${os} "
tags: [ "tests-netty-variant" ]
tasks:
- name: "test-core-task"
- name: "test-reactive-task"

- matrix_name: "tests-netty-compression"
matrix_spec: { compressor: "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk21", version: [ "8.0" ], topology: "replicaset",
os: "linux", async-transport: "netty" }
display_name: "Netty with Compression '${compressor}': ${version} ${topology} ${ssl} ${auth} ${jdk} ${os} "
tags: [ "tests-netty-variant" ]
tasks:
- name: "test-reactive-task"
- name: "test-core-task"

- matrix_name: "tests-netty-ssl-provider"
matrix_spec: { auth: "auth", ssl: "ssl", jdk: "jdk8", version: [ "7.0" ], topology: "replicaset", os: "linux",
matrix_spec: { auth: "auth", ssl: "ssl", jdk: "jdk8", version: [ "8.0" ], topology: "replicaset", os: "linux",
async-transport: "netty", netty-ssl-provider: "*" }
display_name: "Netty SSL provider: ${version} ${topology} ${ssl} SslProvider.${netty-ssl-provider} ${auth} ${jdk} ${os} "
display_name: "Netty with SSL provider '${netty-ssl-provider}': ${version} ${topology} ${ssl} ${auth} ${jdk} ${os} "
tags: [ "tests-netty-variant" ]
tasks:
- name: "test-reactive-task"
Expand Down
23 changes: 14 additions & 9 deletions .evergreen/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,17 @@ provision_ssl () {
}

provision_multi_mongos_uri_for_ssl () {
# Arguments for auth + SSL
if [ "$AUTH" != "noauth" ] || [ "$TOPOLOGY" == "replica_set" ]; then
export MONGODB_URI="${MONGODB_URI}&ssl=true&sslInvalidHostNameAllowed=true"
export MULTI_MONGOS_URI="${MULTI_MONGOS_URI}&ssl=true&sslInvalidHostNameAllowed=true"
else
export MONGODB_URI="${MONGODB_URI}/?ssl=true&sslInvalidHostNameAllowed=true"
export MULTI_MONGOS_URI="${MULTI_MONGOS_URI}/?ssl=true&sslInvalidHostNameAllowed=true"
fi
if [[ "$MONGODB_URI" == *"?"* ]]; then
export MONGODB_URI="${MONGODB_URI}&ssl=true&sslInvalidHostNameAllowed=true"
else
export MONGODB_URI="${MONGODB_URI}/?ssl=true&sslInvalidHostNameAllowed=true"
fi

if [[ "$MULTI_MONGOS_URI" == *"?"* ]]; then
export MULTI_MONGOS_URI="${MULTI_MONGOS_URI}&ssl=true&sslInvalidHostNameAllowed=true"
else
export MULTI_MONGOS_URI="${MULTI_MONGOS_URI}/?ssl=true&sslInvalidHostNameAllowed=true"
fi
}

############################################
Expand Down Expand Up @@ -136,6 +139,8 @@ echo "Running tests with Java ${JAVA_VERSION}"
--stacktrace --info --continue ${TESTS} | tee -a logs.txt

if grep -q 'LEAK:' logs.txt ; then
echo "Netty Leak detected, please inspect build log"
echo "==============================================="
echo " Netty Leak detected, please inspect build log "
echo "==============================================="
exit 1
fi
Loading