From 43b66bdc79842cb5ab38209288790a7b63e5acd6 Mon Sep 17 00:00:00 2001 From: Aditi Khare Date: Tue, 29 Oct 2024 21:55:25 -0400 Subject: [PATCH] ready for review --- .evergreen/config.in.yml | 16 ++-------------- .evergreen/config.yml | 25 ++----------------------- .evergreen/generate_evergreen_tasks.js | 12 ------------ 3 files changed, 4 insertions(+), 49 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index ccbc4e18c73..a753f8f6462 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1389,14 +1389,8 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace - if [[ -n "${USE_SERVERLESS_PROXY}" ]]; - then - export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" - else - export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" - fi LOADBALANCED=ON \ - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ + 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/create-instance.sh @@ -1410,13 +1404,7 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace - if [[ -n "${USE_SERVERLESS_PROXY}" ]]; - then - export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" - else - export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" - fi - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ + SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \ SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \ SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \ SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \ diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 8c3ba94ed45..edd93358090 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -4332,14 +4332,8 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace - if [[ -n "${USE_SERVERLESS_PROXY}" ]]; - then - export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" - else - export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" - fi LOADBALANCED=ON \ - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ + 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/create-instance.sh @@ -4353,13 +4347,7 @@ task_groups: script: | ${PREPARE_SHELL} set +o xtrace - if [[ -n "${USE_SERVERLESS_PROXY}" ]]; - then - export SERVERLESS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}" - else - export SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}" - fi - SERVERLESS_DRIVERS_GROUP=${SERVERLESS_GROUP} \ + SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \ SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \ SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \ SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \ @@ -5082,15 +5070,6 @@ buildvariants: NPM_VERSION: 9 tasks: - serverless_task_group - - name: rhel8-test-serverless-proxy - display_name: Serverless Proxy Test - run_on: rhel80-large - expansions: - NODE_LTS_VERSION: 16 - NPM_VERSION: 9 - USE_SERVERLESS_PROXY: true - tasks: - - serverless_task_group - name: rhel8-test-gcp-kms display_name: GCP KMS Test run_on: debian11-small diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 13b5deec497..69a563c99b4 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -695,18 +695,6 @@ BUILD_VARIANTS.push({ tasks: ['serverless_task_group'] }); -BUILD_VARIANTS.push({ - name: 'rhel8-test-serverless-proxy', - display_name: 'Serverless Proxy Test', - run_on: DEFAULT_OS, - expansions: { - NODE_LTS_VERSION: LOWEST_LTS, - NPM_VERSION: 9, - USE_SERVERLESS_PROXY: true - }, - tasks: ['serverless_task_group'] -}); - BUILD_VARIANTS.push({ name: 'rhel8-test-gcp-kms', display_name: 'GCP KMS Test',