Use setup-secrets and task groups for serverless tests

Author: alcaeus

.evergreen/config.yml

@@ -25,7 +25,6 @@ pre:
   - func: "install composer"
 post:
   - func: "upload test results"
-  - func: "delete serverless instance"
   - func: "stop load balancer"
   - func: "stop mongo-orchestration"
   - func: "cleanup"

.evergreen/config/functions.yml

@@ -177,9 +177,20 @@ functions:
         script: |
           ${PREPARE_SHELL}
 
-          SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
-          SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
-          SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
+          bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
+          bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
+    - command: expansions.update
+      params:
+        file: src/serverless-expansion.yml
+
+  "create serverless proxy instance":
+    - command: shell.exec
+      params:
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+
+          bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
           bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
     - command: expansions.update
       params:
@@ -189,14 +200,7 @@ functions:
     - command: shell.exec
       params:
         script: |
-          # Only run if a serverless instance was started
-          if [ -n "${SERVERLESS_INSTANCE_NAME}" ]; then
-            SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
-            SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
-            SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
-            SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
-          fi
+          bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
 
   "run tests":
     - command: shell.exec

.evergreen/config/test-task-groups.yml

@@ -34,3 +34,41 @@ task_groups:
     setup_group_timeout_secs: 1800
     tasks:
       - test-atlas
+
+  - name: test_serverless_task_group
+    setup_group:
+      - func: "fetch source"
+      - func: "prepare resources"
+      - func: "fix absolute paths"
+      - func: "install dependencies"
+      - func: "locate PHP binaries"
+      - func: "fetch extension"
+      - func: "install composer"
+      - func: "create serverless instance"
+    teardown_group:
+      - func: "delete serverless instance"
+      - func: "upload test results"
+      - func: "cleanup"
+    setup_group_can_fail_task: true
+    setup_group_timeout_secs: 1800
+    tasks:
+      - test-serverless
+
+  - name: test_serverless_proxy_task_group
+    setup_group:
+      - func: "fetch source"
+      - func: "prepare resources"
+      - func: "fix absolute paths"
+      - func: "install dependencies"
+      - func: "locate PHP binaries"
+      - func: "fetch extension"
+      - func: "install composer"
+      - func: "create serverless proxy instance"
+    teardown_group:
+      - func: "delete serverless instance"
+      - func: "upload test results"
+      - func: "cleanup"
+    setup_group_can_fail_task: true
+    setup_group_timeout_secs: 1800
+    tasks:
+      - test-serverless-proxy

.evergreen/config/test-tasks.yml

@@ -11,24 +11,14 @@ tasks:
     tags: ["serverless"]
     exec_timeout_secs: 10800
     commands:
-      - func: "create serverless instance"
       - func: "start kms servers"
       - func: "set aws temp creds"
       - func: "run serverless tests"
 
   - name: "test-serverless-proxy"
     tags: ["serverless"]
-    exec_timeout_secs: 3600
+    exec_timeout_secs: 10800
     commands:
-      # When testing with serverless proxies, update the group ID used in this task. The group ID is needed in a "post"
-      # task that deletes the serverless cluster, so simply changing it for the "create serverless instance" function is
-      # not sufficient.
-      - command: expansions.update
-        params:
-          updates:
-          - key: SERVERLESS_DRIVERS_GROUP
-            value: "${SERVERLESS_PROXY_DRIVERS_GROUP}"
-      - func: "create serverless instance"
       - func: "start kms servers"
       - func: "set aws temp creds"
       - func: "run serverless tests"

.evergreen/config/test-variants.yml

@@ -20,7 +20,8 @@ buildvariants:
       - ".replicaset .local !.csfle !.3.6 !.4.0 !.4.2 !.4.4 !.5.0"
       - ".sharded .local !.csfle !.3.6 !.4.0 !.4.2 !.4.4 !.5.0"
       - ".loadbalanced .local !.csfle !.3.6 !.4.0 !.4.2 !.4.4 !.5.0"
-      - ".serverless"
+      - "test_serverless_task_group"
+      - "test_serverless_proxy_task_group"
   - name: test-debian92-php82-local
     tags: ["test", "debian", "x64"]
     display_name: "Test: Debian 9.2, PHP 8.2"