From cbc29282b5d373cdc001478e0f26b2d8ad55d92a Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 7 Nov 2023 14:49:03 -0500 Subject: [PATCH] test(NODE-5732): update data lake test scripts --- .evergreen/ci_matrix_constants.js | 4 +++- .evergreen/config.in.yml | 13 ++++++++-- .evergreen/config.yml | 33 +++++++++++++++----------- .evergreen/generate_evergreen_tasks.js | 21 +++++++++------- 4 files changed, 45 insertions(+), 26 deletions(-) diff --git a/.evergreen/ci_matrix_constants.js b/.evergreen/ci_matrix_constants.js index d4994f2d3fd..b0a4948775c 100644 --- a/.evergreen/ci_matrix_constants.js +++ b/.evergreen/ci_matrix_constants.js @@ -16,7 +16,8 @@ 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 UBUNTU_20_OS = 'ubuntu2004-small'; +const UBUNTU_22_OS = 'ubuntu2204-large'; const DEBIAN_OS = 'debian11-small'; module.exports = { @@ -33,5 +34,6 @@ module.exports = { MACOS_OS, UBUNTU_OS, UBUNTU_20_OS, + UBUNTU_22_OS, DEBIAN_OS }; diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index 6d10c9604cf..c7c2be41800 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -76,13 +76,15 @@ functions: params: script: | ${PREPARE_SHELL} - DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh + DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh - command: shell.exec params: background: true script: | ${PREPARE_SHELL} - DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh + DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh + sleep 1 + docker ps "bootstrap kms servers": - command: subprocess.exec @@ -1090,6 +1092,13 @@ functions: - ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh tasks: + - name: 'test-atlas-data-lake' + tags: ["datalake", "mongohouse"] + commands: + - func: 'install dependencies' + - func: 'bootstrap mongohoused' + - func: 'run data lake tests' + - name: "test-serverless" tags: ["serverless"] commands: diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 67d1e488621..2addb34e4bb 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -51,13 +51,15 @@ functions: params: script: | ${PREPARE_SHELL} - DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh + DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh - command: shell.exec params: background: true script: | ${PREPARE_SHELL} - DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh + DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh + sleep 1 + docker ps bootstrap kms servers: - command: subprocess.exec params: @@ -1033,6 +1035,14 @@ functions: args: - ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh tasks: + - name: test-atlas-data-lake + tags: + - datalake + - mongohouse + commands: + - func: install dependencies + - func: bootstrap mongohoused + - func: run data lake tests - name: test-serverless tags: - serverless @@ -1700,11 +1710,6 @@ tasks: commands: - func: install dependencies - func: run atlas tests - - name: test-atlas-data-lake - commands: - - func: install dependencies - - func: bootstrap mongohoused - - func: run data lake tests - name: test-5.0-load-balanced tags: - latest @@ -4044,7 +4049,6 @@ buildvariants: - test-3.6-sharded_cluster - test-latest-server-v1-api - test-atlas-connectivity - - test-atlas-data-lake - test-5.0-load-balanced - test-6.0-load-balanced - test-latest-load-balanced @@ -4096,7 +4100,6 @@ buildvariants: - test-3.6-sharded_cluster - test-latest-server-v1-api - test-atlas-connectivity - - test-atlas-data-lake - test-5.0-load-balanced - test-6.0-load-balanced - test-latest-load-balanced @@ -4148,7 +4151,6 @@ buildvariants: - test-3.6-sharded_cluster - test-latest-server-v1-api - test-atlas-connectivity - - test-atlas-data-lake - test-5.0-load-balanced - test-6.0-load-balanced - test-latest-load-balanced @@ -4199,7 +4201,6 @@ buildvariants: - test-3.6-sharded_cluster - test-latest-server-v1-api - test-atlas-connectivity - - test-atlas-data-lake - test-5.0-load-balanced - test-6.0-load-balanced - test-latest-load-balanced @@ -4249,7 +4250,6 @@ buildvariants: - test-3.6-replica_set - test-3.6-sharded_cluster - test-latest-server-v1-api - - test-atlas-data-lake - test-socks5 - test-socks5-tls - test-tls-support-latest @@ -4292,7 +4292,6 @@ buildvariants: - test-3.6-replica_set - test-3.6-sharded_cluster - test-latest-server-v1-api - - test-atlas-data-lake - test-socks5 - test-socks5-tls - test-tls-support-latest @@ -4335,7 +4334,6 @@ buildvariants: - test-3.6-replica_set - test-3.6-sharded_cluster - test-latest-server-v1-api - - test-atlas-data-lake - test-socks5 - test-socks5-tls - test-tls-support-latest @@ -4477,6 +4475,13 @@ buildvariants: aws-4.4-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-unset-no-peer-dependencies - >- aws-4.4-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-set-no-peer-dependencies + - name: ubuntu2204-test-atlas-data-lake + display_name: Atlas Data Lake Tests + run_on: ubuntu2204-large + expansions: + NODE_LTS_VERSION: 20 + tasks: + - test-atlas-data-lake - name: rhel8-custom-dependency-tests display_name: Custom Dependency Version Test run_on: rhel80-large diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 199c756adc0..3c89e085c0c 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -16,7 +16,8 @@ const { MACOS_OS, UBUNTU_OS, UBUNTU_20_OS, - DEBIAN_OS + DEBIAN_OS, + UBUNTU_22_OS } = require('./ci_matrix_constants'); const OPERATING_SYSTEMS = [ @@ -120,14 +121,6 @@ TASKS.push( tags: ['atlas-connect'], commands: [{ func: 'install dependencies' }, { func: 'run atlas tests' }] }, - { - name: 'test-atlas-data-lake', - commands: [ - { func: 'install dependencies' }, - { func: 'bootstrap mongohoused' }, - { func: 'run data lake tests' } - ] - }, { name: 'test-5.0-load-balanced', tags: ['latest', 'sharded_cluster', 'load_balancer'], @@ -599,6 +592,16 @@ BUILD_VARIANTS.push({ tasks: AWS_AUTH_TASKS }); +BUILD_VARIANTS.push({ + name: 'ubuntu2204-test-atlas-data-lake', + display_name: 'Atlas Data Lake Tests', + run_on: UBUNTU_22_OS, + expansions: { + NODE_LTS_VERSION: LATEST_LTS + }, + tasks: ['test-atlas-data-lake'] +}); + const oneOffFuncAsTasks = []; const FLE_PINNED_COMMIT = '974a4614f8c1c3786e5e39fa63568d83f4f69ebd';