Skip to content

Commit 6266734

Browse files
durrandurran
authored
test(NODE-5739): update data lake test scripts (#3918)
1 parent eecdb6b commit 6266734

File tree

4 files changed

+45
-27
lines changed

4 files changed

+45
-27
lines changed

‎.evergreen/ci_matrix_constants.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ const DEFAULT_OS = 'rhel80-large';
1717
const WINDOWS_OS = 'windows-vsCurrent-large';
1818
const MACOS_OS = 'macos-1100';
1919
const UBUNTU_OS = 'ubuntu1804-large';
20-
const UBUNTU_20_OS = 'ubuntu2004-small'
20+
const UBUNTU_20_OS = 'ubuntu2004-small';
21+
const UBUNTU_22_OS = 'ubuntu2204-large';
2122
const DEBIAN_OS = 'debian11-small';
2223

2324
module.exports = {
@@ -34,5 +35,6 @@ module.exports = {
3435
MACOS_OS,
3536
UBUNTU_OS,
3637
UBUNTU_20_OS,
38+
UBUNTU_22_OS,
3739
DEBIAN_OS
3840
};

‎.evergreen/config.in.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,15 @@ functions:
8585
params:
8686
script: |
8787
${PREPARE_SHELL}
88-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
88+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh
8989
- command: shell.exec
9090
params:
9191
background: true
9292
script: |
9393
${PREPARE_SHELL}
94-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
94+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh
95+
sleep 1
96+
docker ps
9597
9698
"bootstrap kms servers":
9799
- command: subprocess.exec
@@ -1088,6 +1090,13 @@ functions:
10881090
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
10891091

10901092
tasks:
1093+
- name: 'test-atlas-data-lake'
1094+
tags: ["datalake", "mongohouse"]
1095+
commands:
1096+
- func: 'install dependencies'
1097+
- func: 'bootstrap mongohoused'
1098+
- func: 'run data lake tests'
1099+
10911100
- name: "test-serverless"
10921101
tags: ["serverless"]
10931102
commands:

‎.evergreen/config.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,15 @@ functions:
5959
params:
6060
script: |
6161
${PREPARE_SHELL}
62-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
62+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh
6363
- command: shell.exec
6464
params:
6565
background: true
6666
script: |
6767
${PREPARE_SHELL}
68-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
68+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh
69+
sleep 1
70+
docker ps
6971
bootstrap kms servers:
7072
- command: subprocess.exec
7173
params:
@@ -1031,6 +1033,14 @@ functions:
10311033
args:
10321034
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
10331035
tasks:
1036+
- name: test-atlas-data-lake
1037+
tags:
1038+
- datalake
1039+
- mongohouse
1040+
commands:
1041+
- func: install dependencies
1042+
- func: bootstrap mongohoused
1043+
- func: run data lake tests
10341044
- name: test-serverless
10351045
tags:
10361046
- serverless
@@ -1683,11 +1693,6 @@ tasks:
16831693
commands:
16841694
- func: install dependencies
16851695
- func: run atlas tests
1686-
- name: test-atlas-data-lake
1687-
commands:
1688-
- func: install dependencies
1689-
- func: bootstrap mongohoused
1690-
- func: run data lake tests
16911696
- name: test-5.0-load-balanced
16921697
tags:
16931698
- latest
@@ -3945,7 +3950,6 @@ buildvariants:
39453950
- test-3.6-sharded_cluster
39463951
- test-latest-server-v1-api
39473952
- test-atlas-connectivity
3948-
- test-atlas-data-lake
39493953
- test-5.0-load-balanced
39503954
- test-6.0-load-balanced
39513955
- test-latest-load-balanced
@@ -3998,7 +4002,6 @@ buildvariants:
39984002
- test-3.6-sharded_cluster
39994003
- test-latest-server-v1-api
40004004
- test-atlas-connectivity
4001-
- test-atlas-data-lake
40024005
- test-5.0-load-balanced
40034006
- test-6.0-load-balanced
40044007
- test-latest-load-balanced
@@ -4049,7 +4052,6 @@ buildvariants:
40494052
- test-3.6-sharded_cluster
40504053
- test-latest-server-v1-api
40514054
- test-atlas-connectivity
4052-
- test-atlas-data-lake
40534055
- test-5.0-load-balanced
40544056
- test-6.0-load-balanced
40554057
- test-latest-load-balanced
@@ -4100,7 +4102,6 @@ buildvariants:
41004102
- test-3.6-sharded_cluster
41014103
- test-latest-server-v1-api
41024104
- test-atlas-connectivity
4103-
- test-atlas-data-lake
41044105
- test-5.0-load-balanced
41054106
- test-6.0-load-balanced
41064107
- test-latest-load-balanced
@@ -4150,7 +4151,6 @@ buildvariants:
41504151
- test-3.6-sharded_cluster
41514152
- test-latest-server-v1-api
41524153
- test-atlas-connectivity
4153-
- test-atlas-data-lake
41544154
- test-5.0-load-balanced
41554155
- test-6.0-load-balanced
41564156
- test-latest-load-balanced
@@ -4199,7 +4199,6 @@ buildvariants:
41994199
- test-3.6-replica_set
42004200
- test-3.6-sharded_cluster
42014201
- test-latest-server-v1-api
4202-
- test-atlas-data-lake
42034202
- test-socks5
42044203
- test-socks5-tls
42054204
- test-tls-support-latest
@@ -4242,7 +4241,6 @@ buildvariants:
42424241
- test-3.6-replica_set
42434242
- test-3.6-sharded_cluster
42444243
- test-latest-server-v1-api
4245-
- test-atlas-data-lake
42464244
- test-socks5
42474245
- test-socks5-tls
42484246
- test-tls-support-latest
@@ -4285,7 +4283,6 @@ buildvariants:
42854283
- test-3.6-replica_set
42864284
- test-3.6-sharded_cluster
42874285
- test-latest-server-v1-api
4288-
- test-atlas-data-lake
42894286
- test-socks5
42904287
- test-socks5-tls
42914288
- test-tls-support-latest
@@ -4427,6 +4424,13 @@ buildvariants:
44274424
aws-4.4-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-unset-no-peer-dependencies
44284425
- >-
44294426
aws-4.4-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-set-no-peer-dependencies
4427+
- name: ubuntu2204-test-atlas-data-lake
4428+
display_name: Atlas Data Lake Tests
4429+
run_on: ubuntu2204-large
4430+
expansions:
4431+
NODE_LTS_VERSION: 20
4432+
tasks:
4433+
- test-atlas-data-lake
44304434
- name: rhel8-custom-dependency-tests
44314435
display_name: Custom Dependency Version Test
44324436
run_on: rhel80-large

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ const {
1616
MACOS_OS,
1717
UBUNTU_OS,
1818
UBUNTU_20_OS,
19-
DEBIAN_OS
19+
DEBIAN_OS,
20+
UBUNTU_22_OS
2021
} = require('./ci_matrix_constants');
2122

2223
const OPERATING_SYSTEMS = [
@@ -125,14 +126,6 @@ TASKS.push(
125126
tags: ['atlas-connect'],
126127
commands: [{ func: 'install dependencies' }, { func: 'run atlas tests' }]
127128
},
128-
{
129-
name: 'test-atlas-data-lake',
130-
commands: [
131-
{ func: 'install dependencies' },
132-
{ func: 'bootstrap mongohoused' },
133-
{ func: 'run data lake tests' }
134-
]
135-
},
136129
{
137130
name: 'test-5.0-load-balanced',
138131
tags: ['latest', 'sharded_cluster', 'load_balancer'],
@@ -608,6 +601,16 @@ BUILD_VARIANTS.push({
608601
tasks: AWS_AUTH_TASKS
609602
});
610603

604+
BUILD_VARIANTS.push({
605+
name: 'ubuntu2204-test-atlas-data-lake',
606+
display_name: 'Atlas Data Lake Tests',
607+
run_on: UBUNTU_22_OS,
608+
expansions: {
609+
NODE_LTS_VERSION: LATEST_LTS
610+
},
611+
tasks: ['test-atlas-data-lake']
612+
});
613+
611614
const oneOffFuncAsTasks = [];
612615

613616
for (const version of ['5.0', 'rapid', 'latest']) {

0 commit comments

Comments
 (0)