@@ -171,14 +171,12 @@ functions:
171171 ./run-mongohouse-image.sh
172172
173173 " create serverless instance " :
174- - command : shell .exec
174+ - command : subprocess .exec
175175 params :
176176 working_dir : " src"
177- script : |
178- ${PREPARE_SHELL}
179-
180- bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
181- bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
177+ binary : bash
178+ args :
179+ - ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
182180 - command : expansions.update
183181 params :
184182 file : src/serverless-expansion.yml
@@ -190,17 +188,19 @@ functions:
190188 script : |
191189 ${PREPARE_SHELL}
192190
193- bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
191+ VAULT_NAME= serverless_next \
194192 bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
195193 - command : expansions.update
196194 params :
197195 file : src/serverless-expansion.yml
198196
199197 " delete serverless instance " :
200- - command : shell .exec
198+ - command : subprocess .exec
201199 params :
202- script : |
203- bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
200+ working_dir : " src"
201+ binary : bash
202+ args :
203+ - ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
204204
205205 " run tests " :
206206 - command : shell.exec
@@ -274,10 +274,13 @@ functions:
274274 export KMS_TLS_CA_FILE="${client_side_encryption_kms_tls_ca_file}"
275275 export KMS_TLS_CERTIFICATE_KEY_FILE="${client_side_encryption_kms_tls_certificate_key_file}"
276276 export MONGODB_IS_SERVERLESS=on
277- export MONGODB_USERNAME=${SERVERLESS_ATLAS_USER}
278- export MONGODB_PASSWORD=${SERVERLESS_ATLAS_PASSWORD}
279277 export PATH="${PHP_PATH}/bin:$PATH"
280278
279+ . ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh
280+
281+ export MONGODB_USERNAME=$SERVERLESS_ATLAS_USER
282+ export MONGODB_PASSWORD=$SERVERLESS_ATLAS_PASSWORD
283+
281284 CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
282285 MONGODB_URI="${SERVERLESS_URI}" \
283286 TESTS="serverless" \
0 commit comments