revert to 542505e

Author: malikj2000

.evergreen/activate-kms-venv.sh

@@ -17,7 +17,6 @@ const DEFAULT_OS = 'rhel80-large';
 const WINDOWS_OS = 'windows-vsCurrent-large';
 const MACOS_OS = 'macos-1100';
 const UBUNTU_OS = 'ubuntu1804-large';
-const UBUNTU_20_OS = 'ubuntu2004-small'
 const DEBIAN_OS = 'debian11-small';
 
 module.exports = {
@@ -33,6 +32,5 @@ module.exports = {
   WINDOWS_OS,
   MACOS_OS,
   UBUNTU_OS,
-  UBUNTU_20_OS,
   DEBIAN_OS
 };

.evergreen/ci_matrix_constants.js

@@ -94,28 +94,11 @@ functions:
           DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
 
   "bootstrap kms servers":
-    - command: subprocess.exec
-      params:
-        binary: bash
-        working_dir: src
-        args:
-          - .evergreen/activate-kms-venv.sh
-        env:
-          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
     - command: subprocess.exec
       params:
         background: true
-        binary: bash
         working_dir: src
-        args:
-          - .evergreen/run-kmip-server.sh
-        env:
-          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-    - command: subprocess.exec
-      params:
-        background: true
         binary: bash
-        working_dir: src
         args:
           - .evergreen/run-kms-servers.sh
         env:
@@ -182,6 +165,31 @@ functions:
           PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
             bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-tests.sh
 
+  "run deployed aws lambda tests":
+    - command: ec2.assume_role
+      params:
+        role_arn: ${LAMBDA_AWS_ROLE_ARN}
+        duration_seconds: 3600
+    - command: subprocess.exec
+      params:
+        working_dir: src
+        binary: bash
+        args:
+          - .evergreen/run-deployed-lambda-aws-tests.sh
+        env:
+          TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
+          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
+          DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
+          DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
+          DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER}
+          DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD}
+          DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
+          LAMBDA_STACK_NAME: dbx-node-lambda
+          AWS_REGION: us-east-1
+          AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+          AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+          AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
+
   "run tests":
     - command: shell.exec
       type: test
@@ -1017,19 +1025,15 @@ functions:
     - command: shell.exec
       type: test
       params:
-        working_dir: src
+        working_dir: "src"
         silent: true
-        shell: bash
         script: |
-          set -ex
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate-authawsvenv.sh
-          python aws_tester.py regular
+          ${MONGODB_BINARIES}/mongo --verbose aws_e2e_regular_aws.js
           cd -
           cat <<EOF > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
             export AWS_ACCESS_KEY_ID=${iam_auth_ecs_account}
             export AWS_SECRET_ACCESS_KEY=${iam_auth_ecs_secret_access_key}
-            export MONGODB_URI="mongodb://localhost:27017/aws?authMechanism=MONGODB-AWS"
           EOF
     - command: shell.exec
       type: test
@@ -1130,18 +1134,18 @@ tasks:
       - func: bootstrap kms servers
       - func: "run serverless tests"
 
-  - name: run-spec-benchmark-tests-node-18-server-6.0
+  - name: run-spec-benchmark-tests
     tags:
       - run-spec-benchmark-tests
       - performance
     exec_timeout_secs: 3600
     commands:
       - func: install dependencies
         vars:
-          NODE_LTS_VERSION: v18.16.0
+          NODE_LTS_VERSION: 18
       - func: bootstrap mongo-orchestration
         vars:
-          VERSION: v6.0-perf
+          VERSION: rapid
           TOPOLOGY: server
           AUTH: noauth
       - func: run spec driver benchmarks
@@ -1240,38 +1244,6 @@ tasks:
           args:
             - src/.evergreen/run-azure-kms-tests.sh
 
-  - name: "oidc-auth-test-azure-latest"
-    commands:
-      - func: "install dependencies"
-      - command: subprocess.exec
-        params:
-          working_dir: src
-          binary: bash
-          env:
-            DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-            PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
-            AZUREOIDC_CLIENTID: ${testazureoidc_clientid}
-            PROVIDER_NAME: azure
-          args:
-          - .evergreen/run-oidc-tests-azure.sh
-
-  - name: "test-aws-lambda-deployed"
-    commands:
-      - func: "install dependencies"
-      - command: ec2.assume_role
-        params:
-          role_arn: ${LAMBDA_AWS_ROLE_ARN}
-          duration_seconds: 3600
-      - command: subprocess.exec
-        params:
-          working_dir: src
-          binary: bash
-          add_expansions_to_env: true
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh
-          env:
-            TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
-            AWS_REGION: us-east-1
 
 task_groups:
   - name: serverless_task_group
@@ -1376,60 +1348,6 @@ task_groups:
     tasks:
       - test-azurekms-task
 
-  - name: testazureoidc_task_group
-    setup_group:
-    - func: fetch source
-    - command: shell.exec
-      params:
-        shell: bash
-        script: |-
-          set -o errexit
-          ${PREPARE_SHELL}
-          export AZUREOIDC_CLIENTID="${testazureoidc_clientid}"
-          export AZUREOIDC_TENANTID="${testazureoic_tenantid}"
-          export AZUREOIDC_SECRET="${testazureoidc_secret}"
-          export AZUREOIDC_KEYVAULT=${testazureoidc_keyvault}
-          export AZUREOIDC_DRIVERS_TOOLS="$DRIVERS_TOOLS"
-          export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER"
-          $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
-    teardown_group:
-    - command: shell.exec
-      params:
-        shell: bash
-        script: |-
-          ${PREPARE_SHELL}
-          $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/delete-vm.sh
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800
-    tasks:
-    - oidc-auth-test-azure-latest
-
-  - name: test_atlas_task_group
-    setup_group:
-      - func: fetch source
-      - command: subprocess.exec
-        params:
-          working_dir: src
-          binary: bash
-          add_expansions_to_env: true
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
-      - command: expansions.update
-        params:
-          file: src/atlas-expansion.yml
-    teardown_group:
-      - command: subprocess.exec
-        params:
-          working_dir: src
-          binary: bash
-          add_expansions_to_env: true
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800
-    tasks:
-      - test-aws-lambda-deployed
-
 pre:
   - func: "fetch source"
   - func: "windows fix"
@@ -1447,6 +1365,6 @@ ignore:
 buildvariants:
   - name: performance-tests
     display_name: Performance Test
-    run_on: rhel90-dbx-perf-large
+    run_on: rhel80-large
     tasks:
-      - run-spec-benchmark-tests-node-18-server-6.0
+      - run-spec-benchmark-tests