SERVER-52685: Fix drivers-nightly

* Use RHEL 7
* Pass Java-specific flag to run-tests.sh
* Test only auth and ssl, not noauth and nossl
* Fix XUnit file glob for Java driver

1 files changed, 18 insertions, 23 deletions

diff --git a/etc/drivers_nightly.yml b/etc/drivers_nightly.yml
index 33e97902535..60071b5fa5e 100644
--- a/etc/drivers_nightly.yml
+++ b/etc/drivers_nightly.yml
@@ -319,6 +319,7 @@ functions:
           ### DRIVER-SPECIFIC VARIABLES HERE
           PYTHON_BINARY="${PYTHON_BINARY}" \
           JDK="${JDK}" \
+          SAFE_FOR_MULTI_MONGOS="true" \
           AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" .evergreen/run-tests.sh
 
   "fix absolute paths":
@@ -647,9 +648,9 @@ axes:
   - id: os
     display_name: OS
     values:
-      - id: "rhel62"
-        display_name: "RHEL 6.2"
-        run_on: rhel62-test
+      - id: "rhel70"
+        display_name: "RHEL 7.0"
+        run_on: rhel70-small
         variables:
           PLATFORM: "linux"
           FILE_EXT: "tgz"
@@ -666,10 +667,7 @@ axes:
         display_name: Auth
         variables:
            AUTH: "auth"
-      - id: "noauth"
-        display_name: NoAuth
-        variables:
-           AUTH: "noauth"
+
   - id: ssl
     display_name: SSL
     values:
@@ -677,10 +675,6 @@ axes:
         display_name: SSL
         variables:
            SSL: "ssl"
-      - id: "nossl"
-        display_name: NoSSL
-        variables:
-           SSL: "nossl"
 
   ### DRIVER-SPECIFIC AXES ###
   ### DRIVERS TEAM, ADD YOUR AXES VARIABLES HERE ###
@@ -694,15 +688,15 @@ axes:
         variables:
            JDK: "jdk8"
            DRIVER_WORKING_DIRECTORY: "mongo-java-driver"
-           DRIVER_TEST_UPLOAD_DIRECTORY: "src/mongo-java-driver/*/build/test-results/TEST-*.xml"
+           DRIVER_TEST_UPLOAD_DIRECTORY: "src/mongo-java-driver/*/build/test-results/*/TEST-*.xml"
   ### Python ###
   - id: python-linux
     display_name: "Python"
     values:
-      - id: "2.7"
-        display_name: "Python 2.7"
+      - id: "3.6"
+        display_name: "Python 3.6"
         variables:
-           PYTHON_BINARY: "/opt/python/2.7/bin/python"
+           PYTHON_BINARY: "/opt/mongodbtoolchain/v2/bin/python3"
            DRIVER_WORKING_DIRECTORY: "mongo-python-driver"
            DRIVER_TEST_UPLOAD_DIRECTORY: "src/mongo-python-driver/xunit-results/TEST-*.xml"
   - id: python-windows
@@ -752,25 +746,26 @@ buildvariants:
 ### MONGO COMPILE VARIANTS ###
 
 ### Linux Compile Variant ###
-- name: rhel62
-  display_name: RHEL 6.2 MongoDB Compile
+- name: rhel70
+  display_name: RHEL 7.0 MongoDB Compile
   modules:
   - enterprise
   run_on:
-  - rhel62-small
+  - rhel70-small
   expansions:
     platform: linux
-    compile_flags: --ssl MONGO_DISTMOD=rhel62 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
-    multiversion_platform_arch: "rhel62"
+    compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+    multiversion_platform_arch: "rhel70"
     multiversion_edition: "targeted"
     num_jobs_available: $(grep -c ^processor /proc/cpuinfo)
     use_scons_cache: true
     ext: tgz
+    compress: tar czf
   tags: ["compile-variant"]
   tasks:
   - name: compile
     distros:
-    - rhel62-large
+    - rhel70-large
   - name: jsCore_WT
 
 ### Windows compile variant ###
@@ -802,7 +797,7 @@ buildvariants:
 
 ### Python Matrix Linux
 - matrix_name: "python-driver-linux"
-  matrix_spec: {auth: "*", ssl: "*", os: "rhel62", python-linux: "2.7"}
+  matrix_spec: {auth: "*", ssl: "*", os: "rhel70", python-linux: "3.6"}
   display_name: "Python Driver ${os} ${python-linux} ${auth} ${ssl}"
   modules: ["mongo-python-driver", "drivers-evergreen-tools"]
   tasks:
@@ -822,7 +817,7 @@ buildvariants:
 
 ### Java Matrix Linux
 - matrix_name: "java-driver-linux"
-  matrix_spec: {auth: "*", ssl: "*", os: "rhel62", jdk: "jdk8"}
+  matrix_spec: {auth: "*", ssl: "*", os: "rhel70", jdk: "jdk8"}
   display_name: "Java Driver ${os} ${jdk} ${auth} ${ssl}"
   modules: ["mongo-java-driver", "drivers-evergreen-tools"]
   tasks: