committing for patch

Author: baileympearson

.evergreen/config.in.yml

@@ -734,7 +734,7 @@ functions:
         args:
           - ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
 
-  "build docker alpine image":
+  "build and test alpine FLE":
     - command: subprocess.exec
       type: test
       params:
@@ -745,7 +745,7 @@ functions:
           DRIVERS_TOOLS: ${DRIVERS_TOOLS}
         binary: bash
         args:
-          - etc/docker.sh
+          - .evergreen/docker/apline.sh
 
 tasks:
   - name: 'test-atlas-data-lake'
@@ -1026,7 +1026,7 @@ tasks:
       - func: bootstrap mongo-orchestration
       - func: bootstrap kms servers
       - func: assume secrets manager rule
-      - func: build docker alpine image
+      - func: build and test alpine FLE
 
 task_groups:
   - name: serverless_task_group

.evergreen/config.yml

@@ -657,7 +657,7 @@ functions:
         binary: bash
         args:
           - ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
-  build docker alpine image:
+  build and test alpine FLE:
     - command: subprocess.exec
       type: test
       params:
@@ -668,7 +668,7 @@ functions:
           DRIVERS_TOOLS: ${DRIVERS_TOOLS}
         binary: bash
         args:
-          - etc/docker.sh
+          - .evergreen/docker/apline.sh
 tasks:
   - name: test-atlas-data-lake
     tags:
@@ -943,7 +943,7 @@ tasks:
       - func: bootstrap mongo-orchestration
       - func: bootstrap kms servers
       - func: assume secrets manager rule
-      - func: build docker alpine image
+      - func: build and test alpine FLE
   - name: test-latest-server
     tags:
       - latest
@@ -4188,8 +4188,21 @@ task_groups:
     setup_group_timeout_secs: 1800
     tasks:
       - test-search-index-helpers
+pre:
+  - func: fetch source
+  - func: windows fix
+  - func: fix absolute paths
+  - func: make files executable
+post:
+  - func: reset aws instance profile
+  - func: upload test results
+  - func: stop mongo-orchestration
+  - func: upload coverage report
+  - func: cleanup
+ignore:
+  - '*.md'
 buildvariants:
-  - name: alpine FLE test
+  - name: Alpine FLE Tests
     display_name: alpine FLE test
     run_on: ubuntu2204-small
     tasks:
@@ -4857,14 +4870,6 @@ buildvariants:
       - run-custom-csfle-tests-rapid
       - run-custom-csfle-tests-latest
       - test-latest-driver-mongodb-client-encryption-6.0.0
-  - name: rhel8-test-serverless
-    display_name: Serverless Test
-    run_on: rhel80-large
-    expansions:
-      NODE_LTS_VERSION: 16
-      NPM_VERSION: 9
-    tasks:
-      - serverless_task_group
   - name: rhel8-test-gcp-kms
     display_name: GCP KMS Test
     run_on: debian11-small
@@ -4944,16 +4949,3 @@ buildvariants:
     run_on: rhel80-large
     tasks:
       - .resource-management
-pre:
-  - func: fetch source
-  - func: windows fix
-  - func: fix absolute paths
-  - func: make files executable
-post:
-  - func: reset aws instance profile
-  - func: upload test results
-  - func: stop mongo-orchestration
-  - func: upload coverage report
-  - func: cleanup
-ignore:
-  - '*.md'

etc/docker.sh .evergreen/docker/alpine.shetc/docker.sh renamed to .evergreen/docker/alpine.sh

@@ -3,9 +3,8 @@
 # script to aid in local testing of linux platforms
 # requires a running docker instance
 
-# s390x, arm64, amd64 for ubuntu
-# amd64 or arm64v8 for alpine
-LINUX_ARCH=arm64v8
+# ubuntu2204 hosts in ci use amd64
+LINUX_ARCH=amd64
 
 # 16.20.1+, default 16.20.1
 NODE_VERSION=20.0.0