@@ -2283,6 +2283,16 @@ axes:
2283
2283
variables :
2284
2284
GO_DIST : " /opt/golang/go1.20"
2285
2285
2286
+ - id : serverless-type
2287
+ display_name : " Serverless Type"
2288
+ values :
2289
+ - id : " original"
2290
+ display_name : " Serverless"
2291
+ - id : " proxy"
2292
+ display_name : " Serverless Proxy"
2293
+ variables :
2294
+ VAULT_NAME : " serverless_next"
2295
+
2286
2296
task_groups :
2287
2297
- name : serverless_task_group
2288
2298
setup_group_can_fail_task : true
@@ -2298,12 +2308,8 @@ task_groups:
2298
2308
shell : " bash"
2299
2309
script : |
2300
2310
${PREPARE_SHELL}
2301
-
2302
- SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
2303
- SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
2304
- SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
2305
- LOADBALANCED=ON \
2306
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
2311
+ bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh ${VAULT_NAME}
2312
+ bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
2307
2313
- command : expansions.update
2308
2314
params :
2309
2315
file : serverless-expansion.yml
@@ -2339,12 +2345,7 @@ task_groups:
2339
2345
shell : " bash"
2340
2346
script : |
2341
2347
${PREPARE_SHELL}
2342
-
2343
- SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
2344
- SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
2345
- SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
2346
- SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
2347
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
2348
+ bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
2348
2349
- func : handle-test-artifacts
2349
2350
- func : cleanup
2350
2351
tasks :
@@ -2667,8 +2668,14 @@ buildvariants:
2667
2668
2668
2669
- matrix_name : " serverless"
2669
2670
tags : ["pullrequest"]
2670
- matrix_spec : { os-serverless: "*" }
2671
- display_name : " Serverless ${os-serverless}"
2671
+ matrix_spec : { os-serverless: "*", serverless-type: "original" }
2672
+ display_name : " ${serverless-type} ${os-serverless}"
2673
+ tasks :
2674
+ - " serverless_task_group"
2675
+
2676
+ - matrix_name : " serverless-proxy"
2677
+ matrix_spec : { os-serverless: "*", serverless-type: "proxy" }
2678
+ display_name : " ${serverless-type} ${os-serverless}"
2672
2679
tasks :
2673
2680
- " serverless_task_group"
2674
2681
0 commit comments