Skip to content

Commit 18d5abe

Browse files
durrandurran
committed
test(NODE-5732): update data lake test scripts (#3913)
1 parent a58f8ee commit 18d5abe

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
@@ -1087,6 +1089,13 @@ functions:
10871089
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
10881090

10891091
tasks:
1092+
- name: 'test-atlas-data-lake'
1093+
tags: ["datalake", "mongohouse"]
1094+
commands:
1095+
- func: 'install dependencies'
1096+
- func: 'bootstrap mongohoused'
1097+
- func: 'run data lake tests'
1098+
10901099
- name: "test-serverless"
10911100
tags: ["serverless"]
10921101
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:
@@ -1030,6 +1032,14 @@ functions:
10301032
args:
10311033
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
10321034
tasks:
1035+
- name: test-atlas-data-lake
1036+
tags:
1037+
- datalake
1038+
- mongohouse
1039+
commands:
1040+
- func: install dependencies
1041+
- func: bootstrap mongohoused
1042+
- func: run data lake tests
10331043
- name: test-serverless
10341044
tags:
10351045
- serverless
@@ -1682,11 +1692,6 @@ tasks:
16821692
commands:
16831693
- func: install dependencies
16841694
- func: run atlas tests
1685-
- name: test-atlas-data-lake
1686-
commands:
1687-
- func: install dependencies
1688-
- func: bootstrap mongohoused
1689-
- func: run data lake tests
16901695
- name: test-5.0-load-balanced
16911696
tags:
16921697
- latest
@@ -3944,7 +3949,6 @@ buildvariants:
39443949
- test-3.6-sharded_cluster
39453950
- test-latest-server-v1-api
39463951
- test-atlas-connectivity
3947-
- test-atlas-data-lake
39483952
- test-5.0-load-balanced
39493953
- test-6.0-load-balanced
39503954
- test-latest-load-balanced
@@ -3997,7 +4001,6 @@ buildvariants:
39974001
- test-3.6-sharded_cluster
39984002
- test-latest-server-v1-api
39994003
- test-atlas-connectivity
4000-
- test-atlas-data-lake
40014004
- test-5.0-load-balanced
40024005
- test-6.0-load-balanced
40034006
- test-latest-load-balanced
@@ -4048,7 +4051,6 @@ buildvariants:
40484051
- test-3.6-sharded_cluster
40494052
- test-latest-server-v1-api
40504053
- test-atlas-connectivity
4051-
- test-atlas-data-lake
40524054
- test-5.0-load-balanced
40534055
- test-6.0-load-balanced
40544056
- test-latest-load-balanced
@@ -4099,7 +4101,6 @@ buildvariants:
40994101
- test-3.6-sharded_cluster
41004102
- test-latest-server-v1-api
41014103
- test-atlas-connectivity
4102-
- test-atlas-data-lake
41034104
- test-5.0-load-balanced
41044105
- test-6.0-load-balanced
41054106
- test-latest-load-balanced
@@ -4149,7 +4150,6 @@ buildvariants:
41494150
- test-3.6-sharded_cluster
41504151
- test-latest-server-v1-api
41514152
- test-atlas-connectivity
4152-
- test-atlas-data-lake
41534153
- test-5.0-load-balanced
41544154
- test-6.0-load-balanced
41554155
- test-latest-load-balanced
@@ -4198,7 +4198,6 @@ buildvariants:
41984198
- test-3.6-replica_set
41994199
- test-3.6-sharded_cluster
42004200
- test-latest-server-v1-api
4201-
- test-atlas-data-lake
42024201
- test-socks5
42034202
- test-socks5-tls
42044203
- test-tls-support-latest
@@ -4241,7 +4240,6 @@ buildvariants:
42414240
- test-3.6-replica_set
42424241
- test-3.6-sharded_cluster
42434242
- test-latest-server-v1-api
4244-
- test-atlas-data-lake
42454243
- test-socks5
42464244
- test-socks5-tls
42474245
- test-tls-support-latest
@@ -4284,7 +4282,6 @@ buildvariants:
42844282
- test-3.6-replica_set
42854283
- test-3.6-sharded_cluster
42864284
- test-latest-server-v1-api
4287-
- test-atlas-data-lake
42884285
- test-socks5
42894286
- test-socks5-tls
42904287
- 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'],
@@ -609,6 +602,16 @@ BUILD_VARIANTS.push({
609602
tasks: AWS_AUTH_TASKS
610603
});
611604

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

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

0 commit comments

Comments
 (0)