Merge pull request #1011

Author: jmikola

.evergreen/config.yml

@@ -326,7 +326,7 @@ functions:
       params:
         script: |
           ${PREPARE_SHELL}
-          MONGODB_VERSION=${VERSION} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} DRIVERS_TOOLS=${DRIVERS_TOOLS} CONFIG=${CONFIG} TOPOLOGY=${TOPOLOGY} STORAGE_ENGINE=${STORAGE_ENGINE} sh ${PROJECT_DIRECTORY}/.evergreen/run-orchestration.sh
+          MONGODB_VERSION=${VERSION} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} DRIVERS_TOOLS=${DRIVERS_TOOLS} CONFIG=${CONFIG} TOPOLOGY=${TOPOLOGY} APPEND_URI=${APPEND_URI} STORAGE_ENGINE=${STORAGE_ENGINE} sh ${PROJECT_DIRECTORY}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with the MONGODB_URI for the cluster
     - command: expansions.update
       params:
@@ -543,6 +543,7 @@ tasks:
           vars:
             TOPOLOGY: "sharded_clusters"
             CONFIG: "cluster"
+            APPEND_URI: "/?retryWrites=false"
         - func: "run tests"
 
     - name: "test-sharded-rs"

.evergreen/run-orchestration.sh

@@ -51,7 +51,7 @@ cat "$ORCHESTRATION_FILE"
 curl --silent --show-error --data @"$ORCHESTRATION_FILE" "$ORCHESTRATION_URL" --max-time 600 --fail -o tmp.json
 cat tmp.json
 URI=$(python -c 'import sys, json; j=json.load(open("tmp.json")); print(j["mongodb_auth_uri" if "mongodb_auth_uri" in j else "mongodb_uri"])' | tr -d '\r')
-echo 'MONGODB_URI: "'$URI'"' > mo-expansion.yml
+echo 'MONGODB_URI: "'${URI}${APPEND_URI}'"' > mo-expansion.yml
 echo "Cluster URI: $URI"
 
 MO_END=$(date +%s)