Use our configs, take #2

Author: derickr

.evergreen/config.yml

@@ -330,7 +330,7 @@ functions:
       params:
         script: |
           ${PREPARE_SHELL}
-          MONGODB_VERSION=${VERSION} PROJECT_DIR=${PROJECT_DIR} CONFIG=${CONFIG} TOPOLOGY=${TOPOLOGY} sh ${PROJECT_DIRECTORY}/.evergreen/run-orchestration.sh
+          MONGODB_VERSION=${VERSION} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} CONFIG=${CONFIG} TOPOLOGY=${TOPOLOGY} sh ${PROJECT_DIRECTORY}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with the MONGODB_URI for the cluster
     - command: expansions.update
       params:
@@ -560,7 +560,7 @@ buildvariants:
 
 - matrix_name: "tests-os-requires-40"
   matrix_spec: {"os-requires-40": "*", "versions": "*", "php-versions": "*" }
-  display_name: "${php-versions} ${os-requires-40}: ${versions}"
+  display_name: "${os-requires-40}: MongoDB ${versions} with ${php-versions}"
   tasks:
      - name: "test-standalone"
      - name: "test-replicaset"

.evergreen/run-orchestration.sh

@@ -26,7 +26,21 @@ download_and_extract "$MONGODB_DOWNLOAD_URL" "$EXTRACT"
 DL_END=$(date +%s)
 MO_START=$(date +%s)
 
-export ORCHESTRATION_FILE="$PROJECT_DIRECTORY/scripts/presets/travis/${TOPOLOGY}"
+ORCHESTRATION_FILE="basic"
+if [ "$AUTH" = "auth" ]; then
+  ORCHESTRATION_FILE="auth"
+fi
+
+if [ "$SSL" != "nossl" ]; then
+   ORCHESTRATION_FILE="${ORCHESTRATION_FILE}-ssl"
+fi
+
+# Storage engine config files do not exist for different topology, auth, or ssl modes.
+if [ ! -z "$STORAGE_ENGINE" ]; then
+  ORCHESTRATION_FILE="$STORAGE_ENGINE"
+fi
+
+export ORCHESTRATION_FILE="$PROJECT_DIRECTORY/scripts/presets/travis/${TOPOLOGY}s/${ORCHESTRATION_FILE}.json"
 export ORCHESTRATION_URL="http://localhost:8889/v1/${TOPOLOGY}s"
 
 # Start mongo-orchestration