@@ -865,10 +865,16 @@ functions:
865865 create-serverless-instance :
866866 - command : shell.exec
867867 params :
868+ shell : bash
868869 script : |
869870 ${PREPARE_SHELL}
870871 set +o xtrace # Disable tracing
871- SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
872+ if [ "Terminating" = "${SERVERLESS_PROXY_TYPE}" ]; then
873+ SERVERLESS_GROUP="${TERMINATING_PROXY_SERVERLESS_DRIVERS_GROUP}"
874+ else
875+ SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
876+ fi
877+ SERVERLESS_DRIVERS_GROUP="$SERVERLESS_GROUP" \
872878 SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
873879 SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
874880 LOADBALANCED=ON \
@@ -880,11 +886,17 @@ functions:
880886 delete-serverless-instance-if-configured :
881887 - command : shell.exec
882888 params :
889+ shell : bash
883890 script : |
884891 if [ "" != "${SERVERLESS}" ]; then
885892 ${PREPARE_SHELL}
886893 set +o xtrace # Disable tracing
887- SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
894+ if [ "Terminating" = "${SERVERLESS_PROXY_TYPE}" ]; then
895+ SERVERLESS_GROUP="${TERMINATING_PROXY_SERVERLESS_DRIVERS_GROUP}"
896+ else
897+ SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
898+ fi
899+ SERVERLESS_DRIVERS_GROUP="$SERVERLESS_GROUP" \
888900 SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
889901 SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
890902 SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
@@ -1305,31 +1317,13 @@ tasks:
13051317
13061318 - name : atlas-search-index-helpers-test
13071319 commands :
1308- - func : run-atlas-search-index-helpers-test
1309-
1310- - name : test-serverless-net472
1311- exec_timeout_secs : 2700 # 45 minutes: 15 for setup + 30 for tests
1312- commands :
1313- - func : create-serverless-instance
1314- - func : run-serverless-tests
1315- vars :
1316- FRAMEWORK : net472
1320+ - func : run-atlas-search-index-helpers-test
13171321
1318- - name : test-serverless-netstandard20
1322+ - name : test-serverless
13191323 exec_timeout_secs : 2700 # 45 minutes: 15 for setup + 30 for tests
13201324 commands :
13211325 - func : create-serverless-instance
13221326 - func : run-serverless-tests
1323- vars :
1324- FRAMEWORK : netstandard20
1325-
1326- - name : test-serverless-netstandard21
1327- exec_timeout_secs : 2700 # 45 minutes: 15 for setup + 30 for tests
1328- commands :
1329- - func : create-serverless-instance
1330- - func : run-serverless-tests
1331- vars :
1332- FRAMEWORK : netstandard21
13331327
13341328 - name : test-ocsp-rsa-valid-cert-server-staples-ca-responder
13351329 tags : ["ocsp"]
@@ -1938,6 +1932,34 @@ axes:
19381932 variables :
19391933 COMPRESSOR : " zstd"
19401934
1935+ - id : target_framework
1936+ display_name : Target .net framework
1937+ values :
1938+ - id : " net472"
1939+ display_name : net472
1940+ variables :
1941+ FRAMEWORK : net472
1942+ - id : " netstandard20"
1943+ display_name : netstandard20
1944+ variables :
1945+ FRAMEWORK : netstandard20
1946+ - id : " netstandard21"
1947+ display_name : netstandard21
1948+ variables :
1949+ FRAMEWORK : netstandard21
1950+
1951+ - id : serverless_proxy_type
1952+ display_name : Serverless Proxy Type
1953+ values :
1954+ - id : " Passthrough"
1955+ display_name : " Serverless Passthrough Proxy"
1956+ variables :
1957+ SERVERLESS_PROXY_TYPE : Passthrough
1958+ - id : " Terminating"
1959+ display_name : " Serverless Terminating Proxy"
1960+ variables :
1961+ SERVERLESS_PROXY_TYPE : Terminating
1962+
19411963task_groups :
19421964 - name : testazurekms-task-group
19431965 setup_group_can_fail_task : true
@@ -2263,19 +2285,16 @@ buildvariants:
22632285
22642286# Serverless tests
22652287- matrix_name : serverless-tests-windows
2266- matrix_spec : { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64" }
2267- display_name : " Serverless ${compressor} ${auth} ${ssl} ${os}"
2288+ matrix_spec : { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: "*", serverless_proxy_type: "*" }
2289+ display_name : " ${serverless_proxy_type} ${compressor} ${auth} ${ssl} ${os} ${target_framework }"
22682290 tasks :
2269- - name : test-serverless-net472
2270- - name : test-serverless-netstandard20
2271- - name : test-serverless-netstandard21
2291+ - name : test-serverless
22722292
22732293- matrix_name : serverless-tests-ubuntu
2274- matrix_spec : { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-1804" }
2275- display_name : " Serverless ${compressor} ${auth} ${ssl} ${os}"
2294+ matrix_spec : { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-1804", target_framework: ["netstandard20", "netstandard21"], serverless_proxy_type: "*" }
2295+ display_name : " ${serverless_proxy_type} ${compressor} ${auth} ${ssl} ${os} ${target_framework }"
22762296 tasks :
2277- - name : test-serverless-netstandard20
2278- - name : test-serverless-netstandard21
2297+ - name : test-serverless
22792298
22802299# Atlas tests
22812300- name : atlas-connectivity-tests
0 commit comments