diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index 6ac4ff68f5..9a94fc3aa3 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1327,8 +1327,14 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace + if [[ -n "${USE_SERVERLESS_PROXY}" ]]; + then + export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" + else + export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" + fi LOADBALANCED=ON \ - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \ + SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \ SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \ bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh @@ -1342,7 +1348,13 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \ + if [[ -n "${USE_SERVERLESS_PROXY}" ]]; + then + export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" + else + export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" + fi + SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \ SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \ SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \ diff --git a/.evergreen/config.yml b/.evergreen/config.yml index c1056a6f0b..8b7fe4eda2 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -3722,8 +3722,14 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace + if [[ -n "${USE_SERVERLESS_PROXY}" ]]; + then + export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" + else + export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" + fi LOADBALANCED=ON \ - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \ + SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \ SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \ bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh @@ -3737,7 +3743,13 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \ + if [[ -n "${USE_SERVERLESS_PROXY}" ]]; + then + export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" + else + export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" + fi + SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \ SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \ SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \ @@ -4373,6 +4385,15 @@ buildvariants: NPM_VERSION: 9 tasks: - serverless_task_group + - name: rhel8-test-serverless-proxy + display_name: Serverless Proxy Test + run_on: rhel80-large + expansions: + NODE_LTS_VERSION: 16 + NPM_VERSION: 9 + USE_SERVERLESS_PROXY: true + tasks: + - serverless_task_group - name: rhel8-test-gcp-kms display_name: GCP KMS Test run_on: debian11-small diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 89d2eb7c88..84bb84e75b 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -695,6 +695,18 @@ BUILD_VARIANTS.push({ tasks: ['serverless_task_group'] }); +BUILD_VARIANTS.push({ + name: 'rhel8-test-serverless-proxy', + display_name: 'Serverless Proxy Test', + run_on: DEFAULT_OS, + expansions: { + NODE_LTS_VERSION: LOWEST_LTS, + NPM_VERSION: 9, + USE_SERVERLESS_PROXY: true + }, + tasks: ['serverless_task_group'] +}); + BUILD_VARIANTS.push({ name: 'rhel8-test-gcp-kms', display_name: 'GCP KMS Test',