Skip to content

Commit c698918

Browse files
durrandurran
authored
test(NODE-5738): update data lake test scripts (#3920)
1 parent 3934465 commit c698918

File tree

4 files changed

+42
-27
lines changed

4 files changed

+42
-27
lines changed

‎.evergreen/ci_matrix_constants.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const DEFAULT_OS = 'rhel80-large';
1919
const WINDOWS_OS = 'windows-vsCurrent-large';
2020
const MACOS_OS = 'macos-1100';
2121
const UBUNTU_OS = 'ubuntu1804-large';
22+
const UBUNTU_22_OS = 'ubuntu2204-large'
2223
const DEBIAN_OS = 'debian11-small';
2324

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

‎.evergreen/config.in.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,15 @@ functions:
7676
params:
7777
script: |
7878
${PREPARE_SHELL}
79-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
79+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh
8080
- command: shell.exec
8181
params:
8282
background: true
8383
script: |
8484
${PREPARE_SHELL}
85-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
85+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh
86+
sleep 1
87+
docker ps
8688
8789
"bootstrap kms servers":
8890
- command: subprocess.exec
@@ -1032,6 +1034,12 @@ functions:
10321034
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
10331035

10341036
tasks:
1037+
- name: 'test-atlas-data-lake'
1038+
tags: ["datalake", "mongohouse"]
1039+
commands:
1040+
- func: 'install dependencies'
1041+
- func: 'bootstrap mongohoused'
1042+
- func: 'run data lake tests'
10351043
- name: "test-serverless"
10361044
tags: ["serverless"]
10371045
commands:

‎.evergreen/config.yml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ functions:
5151
params:
5252
script: |
5353
${PREPARE_SHELL}
54-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
54+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh
5555
- command: shell.exec
5656
params:
5757
background: true
5858
script: |
5959
${PREPARE_SHELL}
60-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-local.sh
60+
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh
61+
sleep 1
62+
docker ps
6163
bootstrap kms servers:
6264
- command: subprocess.exec
6365
params:
@@ -970,6 +972,14 @@ functions:
970972
args:
971973
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
972974
tasks:
975+
- name: test-atlas-data-lake
976+
tags:
977+
- datalake
978+
- mongohouse
979+
commands:
980+
- func: install dependencies
981+
- func: bootstrap mongohoused
982+
- func: run data lake tests
973983
- name: test-serverless
974984
tags:
975985
- serverless
@@ -1454,11 +1464,6 @@ tasks:
14541464
commands:
14551465
- func: install dependencies
14561466
- func: run atlas tests
1457-
- name: test-atlas-data-lake
1458-
commands:
1459-
- func: install dependencies
1460-
- func: bootstrap mongohoused
1461-
- func: run data lake tests
14621467
- name: test-5.0-load-balanced
14631468
tags:
14641469
- latest
@@ -3515,7 +3520,6 @@ buildvariants:
35153520
- test-3.6-sharded_cluster
35163521
- test-latest-server-v1-api
35173522
- test-atlas-connectivity
3518-
- test-atlas-data-lake
35193523
- test-5.0-load-balanced
35203524
- test-6.0-load-balanced
35213525
- test-latest-load-balanced
@@ -3567,7 +3571,6 @@ buildvariants:
35673571
- test-3.6-sharded_cluster
35683572
- test-latest-server-v1-api
35693573
- test-atlas-connectivity
3570-
- test-atlas-data-lake
35713574
- test-5.0-load-balanced
35723575
- test-6.0-load-balanced
35733576
- test-latest-load-balanced
@@ -3619,7 +3622,6 @@ buildvariants:
36193622
- test-3.6-sharded_cluster
36203623
- test-latest-server-v1-api
36213624
- test-atlas-connectivity
3622-
- test-atlas-data-lake
36233625
- test-5.0-load-balanced
36243626
- test-6.0-load-balanced
36253627
- test-latest-load-balanced
@@ -3669,7 +3671,6 @@ buildvariants:
36693671
- test-3.6-sharded_cluster
36703672
- test-latest-server-v1-api
36713673
- test-atlas-connectivity
3672-
- test-atlas-data-lake
36733674
- test-5.0-load-balanced
36743675
- test-6.0-load-balanced
36753676
- test-latest-load-balanced
@@ -3718,7 +3719,6 @@ buildvariants:
37183719
- test-3.6-sharded_cluster
37193720
- test-latest-server-v1-api
37203721
- test-atlas-connectivity
3721-
- test-atlas-data-lake
37223722
- test-5.0-load-balanced
37233723
- test-6.0-load-balanced
37243724
- test-latest-load-balanced
@@ -3768,7 +3768,6 @@ buildvariants:
37683768
- test-3.6-sharded_cluster
37693769
- test-latest-server-v1-api
37703770
- test-atlas-connectivity
3771-
- test-atlas-data-lake
37723771
- test-5.0-load-balanced
37733772
- test-6.0-load-balanced
37743773
- test-latest-load-balanced
@@ -3814,7 +3813,6 @@ buildvariants:
38143813
- test-3.6-replica_set
38153814
- test-3.6-sharded_cluster
38163815
- test-latest-server-v1-api
3817-
- test-atlas-data-lake
38183816
- test-socks5
38193817
- test-socks5-tls
38203818
- test-zstd-compression
@@ -3859,7 +3857,6 @@ buildvariants:
38593857
- test-3.6-replica_set
38603858
- test-3.6-sharded_cluster
38613859
- test-latest-server-v1-api
3862-
- test-atlas-data-lake
38633860
- test-socks5
38643861
- test-socks5-tls
38653862
- test-tls-support-latest
@@ -3902,7 +3899,6 @@ buildvariants:
39023899
- test-3.6-replica_set
39033900
- test-3.6-sharded_cluster
39043901
- test-latest-server-v1-api
3905-
- test-atlas-data-lake
39063902
- test-socks5
39073903
- test-socks5-tls
39083904
- test-tls-support-latest
@@ -3945,7 +3941,6 @@ buildvariants:
39453941
- test-3.6-replica_set
39463942
- test-3.6-sharded_cluster
39473943
- test-latest-server-v1-api
3948-
- test-atlas-data-lake
39493944
- test-socks5
39503945
- test-socks5-tls
39513946
- test-zstd-compression
@@ -4073,6 +4068,13 @@ buildvariants:
40734068
- run-custom-csfle-tests-5.0-pinned-commit
40744069
- run-custom-csfle-tests-rapid-pinned-commit
40754070
- run-custom-csfle-tests-latest-pinned-commit
4071+
- name: ubuntu2204-test-atlas-data-lake
4072+
display_name: Atlas Data Lake Tests
4073+
run_on: ubuntu2204-large
4074+
expansions:
4075+
NODE_LTS_VERSION: 20
4076+
tasks:
4077+
- test-atlas-data-lake
40764078
- name: rhel8-test-serverless
40774079
display_name: Serverless Test
40784080
run_on: rhel80-large

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const {
1515
WINDOWS_OS,
1616
MACOS_OS,
1717
UBUNTU_OS,
18+
UBUNTU_22_OS,
1819
DEBIAN_OS
1920
} = require('./ci_matrix_constants');
2021

@@ -122,14 +123,6 @@ TASKS.push(
122123
tags: ['atlas-connect'],
123124
commands: [{ func: 'install dependencies' }, { func: 'run atlas tests' }]
124125
},
125-
{
126-
name: 'test-atlas-data-lake',
127-
commands: [
128-
{ func: 'install dependencies' },
129-
{ func: 'bootstrap mongohoused' },
130-
{ func: 'run data lake tests' }
131-
]
132-
},
133126
{
134127
name: 'test-5.0-load-balanced',
135128
tags: ['latest', 'sharded_cluster', 'load_balancer'],
@@ -622,6 +615,16 @@ BUILD_VARIANTS.push({
622615
tasks: oneOffFuncAsTasks.map(({ name }) => name)
623616
});
624617

618+
BUILD_VARIANTS.push({
619+
name: 'ubuntu2204-test-atlas-data-lake',
620+
display_name: 'Atlas Data Lake Tests',
621+
run_on: UBUNTU_22_OS,
622+
expansions: {
623+
NODE_LTS_VERSION: LATEST_LTS
624+
},
625+
tasks: ['test-atlas-data-lake']
626+
});
627+
625628
// special case for serverless testing
626629
BUILD_VARIANTS.push({
627630
name: 'rhel8-test-serverless',

0 commit comments

Comments
 (0)