@@ -347,6 +347,16 @@ functions:
347347 ${PREPARE_SHELL}
348348 MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests.sh
349349
350+ " run local tls tests " :
351+ - command : shell.exec
352+ type : test
353+ params :
354+ shell : bash
355+ working_dir : " src"
356+ script : |
357+ ${PREPARE_SHELL}
358+ MONGODB_URI="${MONGODB_URI}" .evergreen/run-local-tls-tests.sh
359+
350360 " run enterprise auth tests " :
351361 - command : shell.exec
352362 type : test
@@ -370,7 +380,7 @@ functions:
370380
371381 ENTERPRISE_AUTH_TESTS=1 IP_ADDR=$IP_ADDR SASL_HOST=${sasl_host} SASL_PORT=${sasl_port} SASL_USER=${sasl_user} SASL_PASS=${sasl_pass} SASL_DB=${sasl_db} PRINCIPAL=${principal} KERBEROS_DB=${kerberos_db} KEYTAB_BASE64=${keytab_base64} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} RVM_RUBY="${RVM_RUBY}" ${PROJECT_DIRECTORY}/.evergreen/run-enterprise-auth-tests.sh
372382
373- " cleanup " :
383+ " cleanup mo " :
374384 - command : shell.exec
375385 params :
376386 script : |
@@ -383,8 +393,20 @@ functions:
383393 . venv/Scripts/activate
384394 fi
385395 mongo-orchestration stop
386- cd -
387- rm -rf $DRIVERS_TOOLS || true
396+
397+ " cleanup mo if running " :
398+ - command : shell.exec
399+ params :
400+ script : |
401+ ${PREPARE_SHELL}
402+ cd "$MONGO_ORCHESTRATION_HOME"
403+ # source the mongo-orchestration virtualenv if it exists
404+ if [ -f venv/bin/activate ]; then
405+ . venv/bin/activate
406+ elif [ -f venv/Scripts/activate ]; then
407+ . venv/Scripts/activate
408+ fi
409+ mongo-orchestration stop || true
388410
389411 " fix absolute paths " :
390412 - command : shell.exec
@@ -422,13 +444,13 @@ functions:
422444 echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test-results.json found was created" } ]}' > ${PROJECT_DIRECTORY}/test-results.json
423445
424446 " install dependencies " :
425- type : test
426- params :
427- working_dir : " src"
428- script : |
429- ${PREPARE_SHELL}
430- file="${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh"
431- [ -f ${ file} ] && sh ${ file} || echo "${ file} not available, skipping"
447+ - command : shell.exec
448+ params :
449+ working_dir : " src"
450+ script : |
451+ ${PREPARE_SHELL}
452+ file="${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh"
453+ [ -f $file ] && sh $file || echo "$file not available, skipping"
432454
433455pre :
434456 - func : " fetch source"
@@ -445,7 +467,7 @@ post:
445467 - func : " upload mo artifacts"
446468 # - func: "upload test results"
447469 - func : " upload test results to s3"
448- - func : " cleanup"
470+ - func : " cleanup mo if running "
449471
450472tasks :
451473
@@ -464,6 +486,10 @@ tasks:
464486 commands :
465487 - func : " bootstrap mongo-orchestration"
466488 - func : " run tests"
489+ # - func: "cleanup mo"
490+ - name : " local-tls-tests"
491+ commands :
492+ - func : " run local tls tests"
467493 - name : " enterprise-auth-tests"
468494 commands :
469495 - func : " run enterprise auth tests"
@@ -825,6 +851,19 @@ buildvariants:
825851 tasks :
826852 - name : " test"
827853
854+ -
855+ matrix_name : " local-tls"
856+ matrix_spec :
857+ # No JRuby due to https://jira.mongodb.org/browse/RUBY-1830
858+ ruby : ["ruby-2.6", "ruby-1.9"]
859+ mongodb-version : ' 4.0'
860+ topology : standalone
861+ display_name : " Local TLS ${ruby}"
862+ run_on :
863+ - ubuntu1404-test
864+ tasks :
865+ - name : " local-tls-tests"
866+
828867-
829868 matrix_name : " enterprise-auth-tests-ubuntu"
830869 matrix_spec :
0 commit comments