Revert some changes in evg setup

Author: comandeo-mongo

Diff for: .evergreen/config/common.yml.erb

@@ -513,6 +513,51 @@ task_groups:
               $DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
     tasks:
       - test-full-atlas-task
+
+  - name: test_aws_lambda_task_group
+    setup_group_can_fail_task: true
+    setup_group_timeout_secs: 1800 # 30 minutes
+    setup_group:
+      - func: fetch source
+      - func: create expansions
+      - command: shell.exec
+        params:
+          shell: "bash"
+          working_dir: "src"
+          script: |
+            ${PREPARE_SHELL}
+
+            echo "Setting up Atlas cluster"
+
+            DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
+              DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
+              DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
+              DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
+              DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
+              LAMBDA_STACK_NAME="dbx-ruby-lambda" \
+              MONGODB_VERSION="7.0" \
+              task_id="${task_id}" \
+              execution="${execution}" \
+              $DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
+      - command: expansions.update
+        params:
+          file: src/atlas-expansion.yml
+    teardown_group:
+      - command: shell.exec
+        params:
+          shell: "bash"
+          working_dir: "src"
+          script: |
+            ${PREPARE_SHELL}
+
+            DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
+              DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
+              DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
+              LAMBDA_STACK_NAME="dbx-ruby-lambda" \
+              task_id="${task_id}" \
+              execution="${execution}" \
+              $DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
+    tasks:
       - test-aws-lambda-deployed
 
   - name: testgcpkms_task_group
@@ -716,12 +761,14 @@ tasks:
         params:
           working_dir: "src"
           shell: "bash"
-          add_expansions_to_env: true
           script: |
             ${PREPARE_SHELL}
-            MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests-deployed-lambda.sh
+            export MONGODB_URI=${MONGODB_URI}
+            .evergreen/run-tests-deployed-lambda.sh
           env:
+            TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/spec/faas/ruby-sam-app
             AWS_REGION: us-east-1
+            PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
             DRIVERS_TOOLS: ${DRIVERS_TOOLS}
             DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
             DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
@@ -733,3 +780,4 @@ tasks:
             AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
             LAMBDA_STACK_NAME: "dbx-ruby-lambda"
             RVM_RUBY: ruby-3.2
+            MONGODB_URI: ${MONGODB_URI}

Diff for: .evergreen/config/standard.yml.erb

@@ -494,10 +494,10 @@ buildvariants:
       - name: testazurekms_task_group
         batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
 
-  - matrix_name: atlas-full-and-lambda
+  - matrix_name: atlas-full
     matrix_spec:
       ruby: <%= latest_ruby %>
-      os: ubuntu2204
+      os: rhel8
     display_name: "Atlas (Full)"
     tasks:
       - name: testatlas_task_group
@@ -520,3 +520,11 @@ buildvariants:
     display_name: "Atlas serverless ${ruby} single mongos"
     tasks:
        - name: test-serverless
+
+  - matrix_name: "aws-lambda"
+    matrix_spec:
+      ruby: <%= latest_ruby %>
+      os: ubuntu2204
+    display_name: "AWS Lambda"
+    tasks:
+       - name: test_aws_lambda_task_group

Diff for: .evergreen/run-tests-deployed-lambda.sh

@@ -13,6 +13,5 @@ set_env_ruby
 echo MONGODB_URI: ${MONGODB_URI}
 
 export MONGODB_URI=${MONGODB_URI}
-export TEST_LAMBDA_DIRECTORY=`dirname "$0"`/../spec/faas/ruby-sam-app
 
 . `dirname "$0"`/run-deployed-lambda-aws-tests.sh