@@ -2289,6 +2289,16 @@ axes:
2289
2289
variables :
2290
2290
GO_DIST : " /opt/golang/go1.20"
2291
2291
2292
+ - id : serverless-type
2293
+ display_name : " Serverless Type"
2294
+ values :
2295
+ - id : " original"
2296
+ display_name : " Serverless"
2297
+ - id : " proxy"
2298
+ display_name : " Serverless Proxy"
2299
+ variables :
2300
+ VAULT_NAME : " serverless_next"
2301
+
2292
2302
task_groups :
2293
2303
- name : serverless_task_group
2294
2304
setup_group_can_fail_task : true
@@ -2304,12 +2314,8 @@ task_groups:
2304
2314
shell : " bash"
2305
2315
script : |
2306
2316
${PREPARE_SHELL}
2307
-
2308
- SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
2309
- SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
2310
- SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
2311
- LOADBALANCED=ON \
2312
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
2317
+ bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh ${VAULT_NAME}
2318
+ bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
2313
2319
- command : expansions.update
2314
2320
params :
2315
2321
file : serverless-expansion.yml
@@ -2345,12 +2351,7 @@ task_groups:
2345
2351
shell : " bash"
2346
2352
script : |
2347
2353
${PREPARE_SHELL}
2348
-
2349
- SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
2350
- SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
2351
- SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
2352
- SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
2353
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
2354
+ bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh ${VAULT_NAME}
2354
2355
- func : handle-test-artifacts
2355
2356
- func : cleanup
2356
2357
tasks :
@@ -2673,8 +2674,14 @@ buildvariants:
2673
2674
2674
2675
- matrix_name : " serverless"
2675
2676
tags : ["pullrequest"]
2676
- matrix_spec : { os-serverless: "*" }
2677
- display_name : " Serverless ${os-serverless}"
2677
+ matrix_spec : { os-serverless: "*", serverless-type: "original" }
2678
+ display_name : " ${serverless-type} ${os-serverless}"
2679
+ tasks :
2680
+ - " serverless_task_group"
2681
+
2682
+ - matrix_name : " serverless-proxy"
2683
+ matrix_spec : { os-serverless: "*", serverless-type: "proxy" }
2684
+ display_name : " ${serverless-type} ${os-serverless}"
2678
2685
tasks :
2679
2686
- " serverless_task_group"
2680
2687
0 commit comments