diff --git a/.evergreen/ci_matrix_constants.js b/.evergreen/ci_matrix_constants.js index fad80fc90c..86f3c12c16 100644 --- a/.evergreen/ci_matrix_constants.js +++ b/.evergreen/ci_matrix_constants.js @@ -17,7 +17,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 = { @@ -34,5 +35,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 69576115a3..15dd7d2de8 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -85,13 +85,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 @@ -1088,6 +1090,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 fe4bc31f27..56f47ec000 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -59,13 +59,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: @@ -1031,6 +1033,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 @@ -1683,11 +1693,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 @@ -3945,7 +3950,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 @@ -3998,7 +4002,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 @@ -4049,7 +4052,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 @@ -4100,7 +4102,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 @@ -4150,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 +4199,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 @@ -4242,7 +4241,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 @@ -4285,7 +4283,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 @@ -4427,6 +4424,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 3a57039f60..4482ffe9f7 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 = [ @@ -125,14 +126,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'], @@ -608,6 +601,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 = []; for (const version of ['5.0', 'rapid', 'latest']) {