Skip to content

Commit 99a0059

Browse files
test(NODE-5731): add serverless proxy testing (#4003)
Co-authored-by: Alena Khineika <[email protected]>
1 parent 1ca6269 commit 99a0059

File tree

3 files changed

+49
-4
lines changed

3 files changed

+49
-4
lines changed

Diff for: .evergreen/config.in.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -1327,8 +1327,14 @@ task_groups:
13271327
script: |
13281328
${PREPARE_SHELL}
13291329
set +o xtrace
1330+
if [[ -n "${USE_SERVERLESS_PROXY}" ]];
1331+
then
1332+
export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
1333+
else
1334+
export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
1335+
fi
13301336
LOADBALANCED=ON \
1331-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
1337+
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \
13321338
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
13331339
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
13341340
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
@@ -1342,7 +1348,13 @@ task_groups:
13421348
script: |
13431349
${PREPARE_SHELL}
13441350
set +o xtrace
1345-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
1351+
if [[ -n "${USE_SERVERLESS_PROXY}" ]];
1352+
then
1353+
export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
1354+
else
1355+
export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
1356+
fi
1357+
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \
13461358
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
13471359
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
13481360
SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \

Diff for: .evergreen/config.yml

+23-2
Original file line numberDiff line numberDiff line change
@@ -3722,8 +3722,14 @@ task_groups:
37223722
script: |
37233723
${PREPARE_SHELL}
37243724
set +o xtrace
3725+
if [[ -n "${USE_SERVERLESS_PROXY}" ]];
3726+
then
3727+
export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
3728+
else
3729+
export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
3730+
fi
37253731
LOADBALANCED=ON \
3726-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
3732+
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \
37273733
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
37283734
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
37293735
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
@@ -3737,7 +3743,13 @@ task_groups:
37373743
script: |
37383744
${PREPARE_SHELL}
37393745
set +o xtrace
3740-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
3746+
if [[ -n "${USE_SERVERLESS_PROXY}" ]];
3747+
then
3748+
export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
3749+
else
3750+
export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
3751+
fi
3752+
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \
37413753
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
37423754
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
37433755
SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
@@ -4373,6 +4385,15 @@ buildvariants:
43734385
NPM_VERSION: 9
43744386
tasks:
43754387
- serverless_task_group
4388+
- name: rhel8-test-serverless-proxy
4389+
display_name: Serverless Proxy Test
4390+
run_on: rhel80-large
4391+
expansions:
4392+
NODE_LTS_VERSION: 16
4393+
NPM_VERSION: 9
4394+
USE_SERVERLESS_PROXY: true
4395+
tasks:
4396+
- serverless_task_group
43764397
- name: rhel8-test-gcp-kms
43774398
display_name: GCP KMS Test
43784399
run_on: debian11-small

Diff for: .evergreen/generate_evergreen_tasks.js

+12
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,18 @@ BUILD_VARIANTS.push({
695695
tasks: ['serverless_task_group']
696696
});
697697

698+
BUILD_VARIANTS.push({
699+
name: 'rhel8-test-serverless-proxy',
700+
display_name: 'Serverless Proxy Test',
701+
run_on: DEFAULT_OS,
702+
expansions: {
703+
NODE_LTS_VERSION: LOWEST_LTS,
704+
NPM_VERSION: 9,
705+
USE_SERVERLESS_PROXY: true
706+
},
707+
tasks: ['serverless_task_group']
708+
});
709+
698710
BUILD_VARIANTS.push({
699711
name: 'rhel8-test-gcp-kms',
700712
display_name: 'GCP KMS Test',

0 commit comments

Comments
 (0)