From ed71112f250938c6789bb97e5813a95a986b76bc Mon Sep 17 00:00:00 2001 From: bailey Date: Thu, 31 Jul 2025 13:50:38 -0600 Subject: [PATCH 1/3] no-story-fix-task-groups --- .evergreen/config.in.yml | 15 +- .evergreen/config.yml | 512 +++++++++++++++++++-------------------- 2 files changed, 251 insertions(+), 276 deletions(-) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index e02f1bbf40..bae7dede80 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -294,19 +294,6 @@ functions: perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename done - "windows fix": - - command: shell.exec - params: - silent: true - script: | - ${PREPARE_SHELL} - # for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do - # cat $i | tr -d '\r' > $i.new - # mv $i.new $i - # done - # Copy client certificate because symlinks do not work on Windows. - cp ${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem - "make files executable": - command: shell.exec params: @@ -993,6 +980,7 @@ tasks: args: - .evergreen/run-search-index-management-tests.sh +task_groups: - name: test_gcpkms_task_group setup_group_can_fail_task: true setup_group_timeout_secs: 1800 # 30 minutes @@ -1255,7 +1243,6 @@ tasks: pre: - func: "fetch source" - - func: "windows fix" - func: "fix absolute paths" - func: "make files executable" diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ef74d7d5c7..ed97dd7a30 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -253,18 +253,6 @@ functions: for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename done - windows fix: - - command: shell.exec - params: - silent: true - script: | - ${PREPARE_SHELL} - # for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do - # cat $i | tr -d '\r' > $i.new - # mv $i.new $i - # done - # Copy client certificate because symlinks do not work on Windows. - cp ${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem make files executable: - command: shell.exec params: @@ -919,255 +907,6 @@ tasks: add_expansions_to_env: true args: - .evergreen/run-search-index-management-tests.sh - - name: test_gcpkms_task_group - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: subprocess.exec - params: - working_dir: src - binary: bash - add_expansions_to_env: true - args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup.sh - teardown_group: - - command: subprocess.exec - params: - binary: bash - args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/teardown.sh - - func: upload coverage report - tasks: - - test-gcpkms-task - - name: test_azurekms_task_group - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: subprocess.exec - params: - working_dir: src - binary: bash - env: - AZUREKMS_VMNAME_PREFIX: NODE_DRIVER - add_expansions_to_env: true - args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh - teardown_group: - - command: expansions.update - params: - file: testazurekms-expansions.yml - - command: subprocess.exec - params: - binary: bash - args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh - - func: upload coverage report - tasks: - - test-azurekms-task - - name: testk8soidc_task_group_eks - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: subprocess.exec - params: - binary: bash - add_expansions_to_env: true - args: - - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh - teardown_group: - - func: upload coverage report - - command: subprocess.exec - params: - binary: bash - args: - - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - oidc-auth-test-k8s-latest-eks - - name: testk8soidc_task_group_gke - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: subprocess.exec - params: - binary: bash - add_expansions_to_env: true - args: - - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh - teardown_group: - - func: upload coverage report - - command: subprocess.exec - params: - binary: bash - args: - - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - oidc-auth-test-k8s-latest-gke - - name: testk8soidc_task_group_aks - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: subprocess.exec - params: - binary: bash - add_expansions_to_env: true - args: - - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh - teardown_group: - - func: upload coverage report - - command: subprocess.exec - params: - binary: bash - args: - - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - oidc-auth-test-k8s-latest-aks - - name: testtestoidc_task_group - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: subprocess.exec - params: - binary: bash - include_expansions_in_env: - - AWS_ACCESS_KEY_ID - - AWS_SECRET_ACCESS_KEY - - AWS_SESSION_TOKEN - env: - MONGODB_VERSION: '8.0' - args: - - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh - teardown_task: - - func: upload coverage report - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - oidc-auth-test-test-latest - - name: testazureoidc_task_group - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: shell.exec - params: - shell: bash - add_expansions_to_env: true - script: |- - set -o errexit - ${PREPARE_SHELL} - export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER" - $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/setup.sh - teardown_group: - - command: shell.exec - params: - shell: bash - script: |- - ${PREPARE_SHELL} - $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/teardown.sh - - func: upload coverage report - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - oidc-auth-test-azure-latest - - name: testgcpoidc_task_group - setup_group: - - func: fetch source - - func: assume secrets manager role - - command: shell.exec - params: - shell: bash - add_expansions_to_env: true - script: |- - set -o errexit - ${PREPARE_SHELL} - export GCPOIDC_VMNAME_PREFIX="NODE_DRIVER" - $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/setup.sh - teardown_group: - - command: shell.exec - params: - shell: bash - script: |- - ${PREPARE_SHELL} - $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/teardown.sh - - func: upload coverage report - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - oidc-auth-test-gcp-latest - - name: test_atlas_task_group - setup_group: - - func: fetch source - - command: expansions.update - type: setup - params: - updates: - - {key: MONGODB_VERSION, value: '7.0'} - - {key: LAMBDA_STACK_NAME, value: dbx-node-lambda} - - {key: CLUSTER_PREFIX, value: dbx-node-lambda} - - func: assume secrets manager role - - command: subprocess.exec - params: - working_dir: src - binary: bash - add_expansions_to_env: true - args: - - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh - - atlas - - command: expansions.update - params: - file: src/atlas-expansion.yml - teardown_group: - - command: subprocess.exec - params: - working_dir: src - binary: bash - args: - - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh - - func: upload coverage report - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - test-aws-lambda-deployed - - name: test_atlas_task_group_search_indexes - setup_group: - - func: fetch source - - command: expansions.update - type: setup - params: - updates: - - {key: MONGODB_VERSION, value: '7.0'} - - {key: CLUSTER_PREFIX, value: dbx-node-lambda} - - func: assume secrets manager role - - 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 - args: - - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh - - func: upload coverage report - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - test-search-index-helpers - name: test-latest-server tags: - latest @@ -3026,9 +2765,258 @@ tasks: - func: install dependencies - func: bootstrap mongo-orchestration - func: run tests +task_groups: + - name: test_gcpkms_task_group + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: subprocess.exec + params: + working_dir: src + binary: bash + add_expansions_to_env: true + args: + - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup.sh + teardown_group: + - command: subprocess.exec + params: + binary: bash + args: + - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/teardown.sh + - func: upload coverage report + tasks: + - test-gcpkms-task + - name: test_azurekms_task_group + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: subprocess.exec + params: + working_dir: src + binary: bash + env: + AZUREKMS_VMNAME_PREFIX: NODE_DRIVER + add_expansions_to_env: true + args: + - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh + teardown_group: + - command: expansions.update + params: + file: testazurekms-expansions.yml + - command: subprocess.exec + params: + binary: bash + args: + - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh + - func: upload coverage report + tasks: + - test-azurekms-task + - name: testk8soidc_task_group_eks + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: subprocess.exec + params: + binary: bash + add_expansions_to_env: true + args: + - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh + teardown_group: + - func: upload coverage report + - command: subprocess.exec + params: + binary: bash + args: + - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - oidc-auth-test-k8s-latest-eks + - name: testk8soidc_task_group_gke + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: subprocess.exec + params: + binary: bash + add_expansions_to_env: true + args: + - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh + teardown_group: + - func: upload coverage report + - command: subprocess.exec + params: + binary: bash + args: + - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - oidc-auth-test-k8s-latest-gke + - name: testk8soidc_task_group_aks + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: subprocess.exec + params: + binary: bash + add_expansions_to_env: true + args: + - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh + teardown_group: + - func: upload coverage report + - command: subprocess.exec + params: + binary: bash + args: + - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - oidc-auth-test-k8s-latest-aks + - name: testtestoidc_task_group + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: subprocess.exec + params: + binary: bash + include_expansions_in_env: + - AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY + - AWS_SESSION_TOKEN + env: + MONGODB_VERSION: '8.0' + args: + - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh + teardown_task: + - func: upload coverage report + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - oidc-auth-test-test-latest + - name: testazureoidc_task_group + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: shell.exec + params: + shell: bash + add_expansions_to_env: true + script: |- + set -o errexit + ${PREPARE_SHELL} + export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER" + $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/setup.sh + teardown_group: + - command: shell.exec + params: + shell: bash + script: |- + ${PREPARE_SHELL} + $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/teardown.sh + - func: upload coverage report + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - oidc-auth-test-azure-latest + - name: testgcpoidc_task_group + setup_group: + - func: fetch source + - func: assume secrets manager role + - command: shell.exec + params: + shell: bash + add_expansions_to_env: true + script: |- + set -o errexit + ${PREPARE_SHELL} + export GCPOIDC_VMNAME_PREFIX="NODE_DRIVER" + $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/setup.sh + teardown_group: + - command: shell.exec + params: + shell: bash + script: |- + ${PREPARE_SHELL} + $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/teardown.sh + - func: upload coverage report + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - oidc-auth-test-gcp-latest + - name: test_atlas_task_group + setup_group: + - func: fetch source + - command: expansions.update + type: setup + params: + updates: + - {key: MONGODB_VERSION, value: '7.0'} + - {key: LAMBDA_STACK_NAME, value: dbx-node-lambda} + - {key: CLUSTER_PREFIX, value: dbx-node-lambda} + - func: assume secrets manager role + - command: subprocess.exec + params: + working_dir: src + binary: bash + add_expansions_to_env: true + args: + - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh + - atlas + - command: expansions.update + params: + file: src/atlas-expansion.yml + teardown_group: + - command: subprocess.exec + params: + working_dir: src + binary: bash + args: + - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh + - func: upload coverage report + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - test-aws-lambda-deployed + - name: test_atlas_task_group_search_indexes + setup_group: + - func: fetch source + - command: expansions.update + type: setup + params: + updates: + - {key: MONGODB_VERSION, value: '7.0'} + - {key: CLUSTER_PREFIX, value: dbx-node-lambda} + - func: assume secrets manager role + - 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 + args: + - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh + - func: upload coverage report + setup_group_can_fail_task: true + 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: From 0b748da63ea6594e9d7e5aebc3c5d73b3c86b11d Mon Sep 17 00:00:00 2001 From: bailey Date: Thu, 31 Jul 2025 14:04:57 -0600 Subject: [PATCH 2/3] update det to latest --- drivers-evergreen-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers-evergreen-tools b/drivers-evergreen-tools index 3290c5a687..36c35d0117 160000 --- a/drivers-evergreen-tools +++ b/drivers-evergreen-tools @@ -1 +1 @@ -Subproject commit 3290c5a68739ed1ba35de2c51a3eb0daa36d1f5b +Subproject commit 36c35d0117336323fddd21292c2b3a925ccd4f63 From 7b41ff4ce9761314044055bde79b8349491fdd09 Mon Sep 17 00:00:00 2001 From: bailey Date: Thu, 31 Jul 2025 14:40:25 -0600 Subject: [PATCH 3/3] skip Azure KMS tests --- .evergreen/config.yml | 2 -- .evergreen/generate_evergreen_tasks.js | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ed97dd7a30..11c43b2f21 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -3611,7 +3611,6 @@ buildvariants: run_on: debian11-small batchtime: 20160 tasks: - - test_azurekms_task_group - test-azurekms-fail-task - name: ubuntu20-test-all-oidc display_name: MONGODB-OIDC Auth Tests @@ -3621,7 +3620,6 @@ buildvariants: batchtime: 20160 tasks: - testtestoidc_task_group - - testazureoidc_task_group - testgcpoidc_task_group - testk8soidc_task_group_eks - testk8soidc_task_group_gke diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index c5e902f7b8..ddb2989e02 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -810,7 +810,9 @@ BUILD_VARIANTS.push({ display_name: 'Azure KMS Test', run_on: DEBIAN_OS, batchtime: 20160, - tasks: ['test_azurekms_task_group', 'test-azurekms-fail-task'] + // TODO(NODE-7080): Fix setup of Azure tests in CI + // tasks: ['test_azurekms_task_group', 'test-azurekms-fail-task'] + tasks: ['test-azurekms-fail-task'] }); BUILD_VARIANTS.push({ @@ -823,7 +825,8 @@ BUILD_VARIANTS.push({ batchtime: 20160, tasks: [ 'testtestoidc_task_group', - 'testazureoidc_task_group', + // TODO(NODE-7080): Fix setup of Azure tests in CI + // 'testazureoidc_task_group', 'testgcpoidc_task_group', 'testk8soidc_task_group_eks', 'testk8soidc_task_group_gke',