@@ -227,24 +227,29 @@ functions:
227227 type : test
228228 params :
229229 working_dir : " src"
230+ env :
231+ AWS_ACCESS_KEY_ID : ${aws_access_key_id}
232+ AWS_SECRET_ACCESS_KEY : ${aws_secret_access_key}
233+ AWS_DEFAULT_REGION : us-east-1
234+ AZURE_TENANT_ID : ${azure_tenant_id}
235+ AZURE_CLIENT_ID : ${azure_client_id}
236+ AZURE_CLIENT_SECRET : ${azure_client_secret}
237+ GCP_EMAIL : ${gcp_email}
238+ GCP_PRIVATE_KEY : ${gcp_private_key}
239+ AZUREKMS_KEY_VAULT_ENDPOINT : ${testazurekms_keyvaultendpoint}
240+ AZUREKMS_KEY_NAME : ${testazurekms_keyname}
230241 script : |
231242 ${PREPARE_SHELL}
232- export AWS_ACCESS_KEY_ID=${aws_access_key_id}
233- export AWS_SECRET_ACCESS_KEY=${aws_secret_access_key}
234- export AWS_DEFAULT_REGION=us-east-1
243+
235244 . ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
245+
246+ export AWS_TEMP_ACCESS_KEY_ID=$CSFLE_AWS_TEMP_ACCESS_KEY_ID
247+ export AWS_TEMP_SECRET_ACCESS_KEY=$CSFLE_AWS_TEMP_SECRET_ACCESS_KEY
248+ export AWS_TEMP_SESSION_TOKEN=$CSFLE_AWS_TEMP_SESSION_TOKEN
249+ export CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH}
250+
236251 AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" SAFE_FOR_MULTI_MONGOS="${SAFE_FOR_MULTI_MONGOS}" TOPOLOGY="${TOPOLOGY}" \
237- COMPRESSOR="${COMPRESSOR}" JAVA_VERSION="${JAVA_VERSION}" \
238- AWS_ACCESS_KEY_ID=${aws_access_key_id} AWS_SECRET_ACCESS_KEY=${aws_secret_access_key} \
239- AWS_TEMP_ACCESS_KEY_ID=$CSFLE_AWS_TEMP_ACCESS_KEY_ID \
240- AWS_TEMP_SECRET_ACCESS_KEY=$CSFLE_AWS_TEMP_SECRET_ACCESS_KEY \
241- AWS_TEMP_SESSION_TOKEN=$CSFLE_AWS_TEMP_SESSION_TOKEN \
242- AZURE_TENANT_ID=${azure_tenant_id} AZURE_CLIENT_ID=${azure_client_id} AZURE_CLIENT_SECRET=${azure_client_secret} \
243- GCP_EMAIL=${gcp_email} GCP_PRIVATE_KEY=${gcp_private_key} \
244- AZUREKMS_KEY_VAULT_ENDPOINT=${testazurekms_keyvaultendpoint} \
245- AZUREKMS_KEY_NAME=${testazurekms_keyname} \
246- REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
247- CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" \
252+ COMPRESSOR="${COMPRESSOR}" JAVA_VERSION="${JAVA_VERSION}" REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
248253 .evergreen/run-tests.sh
249254
250255 " run load-balancer tests " :
@@ -784,52 +789,65 @@ functions:
784789 type : test
785790 params :
786791 working_dir : " src"
792+ env :
793+ AWS_ACCESS_KEY_ID : ${aws_access_key_id}
794+ AWS_SECRET_ACCESS_KEY : ${aws_secret_access_key}
787795 script : |
788796 ${PREPARE_SHELL}
789797 set +o xtrace
790- MONGODB_URI="${MONGODB_URI}" AWS_ACCESS_KEY_ID=${aws_access_key_id} AWS_SECRET_ACCESS_KEY=${aws_secret_access_key} \
791- .evergreen/run-csfle-aws-from-environment.sh
798+ MONGODB_URI="${MONGODB_URI}" .evergreen/run-csfle-aws-from-environment.sh
792799
793800 " run csfle tests with mongocryptd " :
794801 - command : shell.exec
795802 type : test
796803 params :
797804 working_dir : " src"
805+ env :
806+ AWS_ACCESS_KEY_ID : ${aws_access_key_id}
807+ AWS_SECRET_ACCESS_KEY : ${aws_secret_access_key}
808+ AWS_DEFAULT_REGION : us-east-1
809+ AZURE_TENANT_ID : ${azure_tenant_id}
810+ AZURE_CLIENT_ID : ${azure_client_id}
811+ AZURE_CLIENT_SECRET : ${azure_client_secret}
812+ GCP_EMAIL : ${gcp_email}
813+ GCP_PRIVATE_KEY : ${gcp_private_key}
814+ AZUREKMS_KEY_VAULT_ENDPOINT : ${testazurekms_keyvaultendpoint}
815+ AZUREKMS_KEY_NAME : ${testazurekms_keyname}
798816 script : |
799817 ${PREPARE_SHELL}
800- export AWS_ACCESS_KEY_ID=${aws_access_key_id}
801- export AWS_SECRET_ACCESS_KEY=${aws_secret_access_key}
802- export AWS_DEFAULT_REGION=us-east-1
803818 . ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
804- MONGODB_URI="${MONGODB_URI}" \
805- JAVA_VERSION="${JAVA_VERSION}" \
806- AWS_ACCESS_KEY_ID=${aws_access_key_id} AWS_SECRET_ACCESS_KEY=${aws_secret_access_key} \
807- AWS_TEMP_ACCESS_KEY_ID=$CSFLE_AWS_TEMP_ACCESS_KEY_ID \
808- AWS_TEMP_SECRET_ACCESS_KEY=$CSFLE_AWS_TEMP_SECRET_ACCESS_KEY \
809- AWS_TEMP_SESSION_TOKEN=$CSFLE_AWS_TEMP_SESSION_TOKEN \
810- AZURE_TENANT_ID=${azure_tenant_id} AZURE_CLIENT_ID=${azure_client_id} AZURE_CLIENT_SECRET=${azure_client_secret} \
811- GCP_EMAIL=${gcp_email} GCP_PRIVATE_KEY=${gcp_private_key} \
812- AZUREKMS_KEY_VAULT_ENDPOINT=${testazurekms_keyvaultendpoint} \
813- AZUREKMS_KEY_NAME=${testazurekms_keyname} \
814- .evergreen/run-csfle-tests-with-mongocryptd.sh
819+
820+ export AWS_TEMP_ACCESS_KEY_ID=$CSFLE_AWS_TEMP_ACCESS_KEY_ID
821+ export AWS_TEMP_SECRET_ACCESS_KEY=$CSFLE_AWS_TEMP_SECRET_ACCESS_KEY
822+ export AWS_TEMP_SESSION_TOKEN=$CSFLE_AWS_TEMP_SESSION_TOKEN
823+
824+ MONGODB_URI="${MONGODB_URI}" JAVA_VERSION="${JAVA_VERSION}" .evergreen/run-csfle-tests-with-mongocryptd.sh
815825
816826 " publish snapshot " :
817827 - command : shell.exec
818828 type : test
819829 params :
820830 working_dir : " src"
831+ env :
832+ NEXUS_USERNAME : ${nexus_username}
833+ NEXUS_PASSWORD : ${nexus_password}
834+ SIGNING_PASSWORD : ${signing_password}
835+ SIGNING_KEY : ${gpg_ascii_armored}
821836 script : |
822- # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
823- RELEASE=false PROJECT_DIRECTORY=${PROJECT_DIRECTORY} NEXUS_USERNAME=${nexus_username} NEXUS_PASSWORD=${nexus_password} SIGNING_PASSWORD=${signing_password} SIGNING_KEY="${gpg_ascii_armored}" .evergreen/publish.sh
837+ RELEASE=false PROJECT_DIRECTORY=${PROJECT_DIRECTORY} .evergreen/publish.sh
824838
825839 " publish release " :
826840 - command : shell.exec
827841 type : test
828842 params :
829843 working_dir : " src"
844+ env :
845+ NEXUS_USERNAME : ${nexus_username}
846+ NEXUS_PASSWORD : ${nexus_password}
847+ SIGNING_PASSWORD : ${signing_password}
848+ SIGNING_KEY : ${gpg_ascii_armored}
830849 script : |
831- # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
832- RELEASE=true PROJECT_DIRECTORY=${PROJECT_DIRECTORY} NEXUS_USERNAME=${nexus_username} NEXUS_PASSWORD=${nexus_password} SIGNING_PASSWORD=${signing_password} SIGNING_KEY="${gpg_ascii_armored}" .evergreen/publish.sh
850+ RELEASE=true PROJECT_DIRECTORY=${PROJECT_DIRECTORY} .evergreen/publish.sh
833851
834852 " cleanup " :
835853 - command : shell.exec
0 commit comments