Skip to content

Commit 2eb9288

Browse files
baileympearsonbaileympearson
committed
use alpha.3
1 parent 4842cd8 commit 2eb9288

File tree

7 files changed

+178
-79
lines changed

7 files changed

+178
-79
lines changed

‎.evergreen/config.in.yml

+19-14
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,12 @@ functions:
316316
SKIP_DEPS=${SKIP_DEPS|1} \
317317
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
318318
319-
"install package":
319+
install package:
320320
- command: shell.exec
321321
params:
322322
working_dir: src
323323
script: |
324+
source ${DRIVERS_TOOLS}/.evergreen/init-node-and-npm-env.sh
324325
npm install --force ${PACKAGE}
325326
326327
"run lint checks":
@@ -772,8 +773,8 @@ functions:
772773
${PREPARE_SHELL}
773774
${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
774775
775-
"run aws auth test with aws credentials and session token as environment variables":
776-
- command: shell.exec
776+
? "run aws auth test with aws credentials and session token as environment variables"
777+
: - command: shell.exec
777778
type: test
778779
params:
779780
working_dir: "src"
@@ -829,8 +830,8 @@ functions:
829830
${PREPARE_SHELL}
830831
${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
831832
832-
"run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME unset":
833-
- command: shell.exec
833+
? "run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME unset"
834+
: - command: shell.exec
834835
type: test
835836
params:
836837
working_dir: "src"
@@ -1143,12 +1144,12 @@ functions:
11431144
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
11441145

11451146
tasks:
1146-
- name: 'test-atlas-data-lake'
1147+
- name: "test-atlas-data-lake"
11471148
tags: ["datalake", "mongohouse"]
11481149
commands:
1149-
- func: 'install dependencies'
1150-
- func: 'bootstrap mongohoused'
1151-
- func: 'run data lake tests'
1150+
- func: "install dependencies"
1151+
- func: "bootstrap mongohoused"
1152+
- func: "run data lake tests"
11521153

11531154
- name: "test-serverless"
11541155
tags: ["serverless"]
@@ -1333,7 +1334,8 @@ tasks:
13331334
ENVIRONMENT: k8s
13341335
K8S_VARIANT: eks
13351336
SCRIPT: run-oidc-prose-tests.sh
1336-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1337+
include_expansions_in_env:
1338+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
13371339
args:
13381340
- .evergreen/run-oidc-tests-k8s.sh
13391341

@@ -1351,7 +1353,8 @@ tasks:
13511353
ENVIRONMENT: k8s
13521354
K8S_VARIANT: gke
13531355
SCRIPT: run-oidc-prose-tests.sh
1354-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1356+
include_expansions_in_env:
1357+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
13551358
args:
13561359
- .evergreen/run-oidc-tests-k8s.sh
13571360

@@ -1369,7 +1372,8 @@ tasks:
13691372
ENVIRONMENT: k8s
13701373
K8S_VARIANT: aks
13711374
SCRIPT: run-oidc-prose-tests.sh
1372-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1375+
include_expansions_in_env:
1376+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
13731377
args:
13741378
- .evergreen/run-oidc-tests-k8s.sh
13751379

@@ -1658,11 +1662,12 @@ task_groups:
16581662
- command: subprocess.exec
16591663
params:
16601664
binary: bash
1661-
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1665+
include_expansions_in_env:
1666+
["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
16621667
env:
16631668
MONGODB_VERSION: "8.0"
16641669
args:
1665-
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
1670+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
16661671
setup_group_can_fail_task: true
16671672
setup_group_timeout_secs: 1800
16681673
tasks:

‎.evergreen/config.yml

+48-7
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ functions:
287287
params:
288288
working_dir: src
289289
script: |
290+
source ${DRIVERS_TOOLS}/.evergreen/init-node-and-npm-env.sh
290291
npm install --force ${PACKAGE}
291292
run lint checks:
292293
- command: subprocess.exec
@@ -2105,7 +2106,23 @@ tasks:
21052106
- func: install dependencies
21062107
- func: bootstrap mongo-orchestration
21072108
- func: run socks5 tests
2108-
- name: test-zstd-compression
2109+
- name: test-snappy-compression
2110+
tags:
2111+
- latest
2112+
- snappy
2113+
commands:
2114+
- command: expansions.update
2115+
type: setup
2116+
params:
2117+
updates:
2118+
- {key: VERSION, value: latest}
2119+
- {key: TOPOLOGY, value: replica_set}
2120+
- {key: AUTH, value: auth}
2121+
- {key: COMPRESSOR, value: snappy}
2122+
- func: install dependencies
2123+
- func: bootstrap mongo-orchestration
2124+
- func: run-compression-tests
2125+
- name: test-zstd-1.x-compression
21092126
tags:
21102127
- latest
21112128
- zstd
@@ -2120,11 +2137,14 @@ tasks:
21202137
- {key: COMPRESSOR, value: zstd}
21212138
- func: install dependencies
21222139
- func: bootstrap mongo-orchestration
2140+
- func: install package
2141+
vars:
2142+
PACKAGE: '@mongodb-js/[email protected]'
21232143
- func: run-compression-tests
2124-
- name: test-snappy-compression
2144+
- name: test-zstd-2.x-compression
21252145
tags:
21262146
- latest
2127-
- snappy
2147+
- zstd
21282148
commands:
21292149
- command: expansions.update
21302150
type: setup
@@ -2133,7 +2153,7 @@ tasks:
21332153
- {key: VERSION, value: latest}
21342154
- {key: TOPOLOGY, value: replica_set}
21352155
- {key: AUTH, value: auth}
2136-
- {key: COMPRESSOR, value: snappy}
2156+
- {key: COMPRESSOR, value: zstd}
21372157
- func: install dependencies
21382158
- func: bootstrap mongo-orchestration
21392159
- func: run-compression-tests
@@ -4785,6 +4805,9 @@ buildvariants:
47854805
- test-socks5
47864806
- test-socks5-csfle
47874807
- test-socks5-tls
4808+
- test-snappy-compression
4809+
- test-zstd-1.x-compression
4810+
- test-zstd-2.x-compression
47884811
- test-tls-support-latest
47894812
- test-tls-support-8.0
47904813
- test-tls-support-7.0
@@ -4841,6 +4864,9 @@ buildvariants:
48414864
- test-socks5
48424865
- test-socks5-csfle
48434866
- test-socks5-tls
4867+
- test-snappy-compression
4868+
- test-zstd-1.x-compression
4869+
- test-zstd-2.x-compression
48444870
- test-tls-support-latest
48454871
- test-tls-support-8.0
48464872
- test-tls-support-7.0
@@ -4897,6 +4923,9 @@ buildvariants:
48974923
- test-socks5
48984924
- test-socks5-csfle
48994925
- test-socks5-tls
4926+
- test-snappy-compression
4927+
- test-zstd-1.x-compression
4928+
- test-zstd-2.x-compression
49004929
- test-tls-support-latest
49014930
- test-tls-support-8.0
49024931
- test-tls-support-7.0
@@ -4953,8 +4982,9 @@ buildvariants:
49534982
- test-socks5
49544983
- test-socks5-csfle
49554984
- test-socks5-tls
4956-
- test-zstd-compression
49574985
- test-snappy-compression
4986+
- test-zstd-1.x-compression
4987+
- test-zstd-2.x-compression
49584988
- test-tls-support-latest
49594989
- test-tls-support-8.0
49604990
- test-tls-support-7.0
@@ -5009,8 +5039,9 @@ buildvariants:
50095039
- test-auth-ldap
50105040
- test-socks5-csfle
50115041
- test-socks5-tls
5012-
- test-zstd-compression
50135042
- test-snappy-compression
5043+
- test-zstd-1.x-compression
5044+
- test-zstd-2.x-compression
50145045
- test-tls-support-latest
50155046
- test-tls-support-8.0
50165047
- test-tls-support-7.0
@@ -5055,6 +5086,9 @@ buildvariants:
50555086
- test-latest-server-v1-api
50565087
- test-socks5
50575088
- test-socks5-tls
5089+
- test-snappy-compression
5090+
- test-zstd-1.x-compression
5091+
- test-zstd-2.x-compression
50585092
- test-tls-support-latest
50595093
- test-tls-support-8.0
50605094
- test-tls-support-7.0
@@ -5099,6 +5133,9 @@ buildvariants:
50995133
- test-latest-server-v1-api
51005134
- test-socks5
51015135
- test-socks5-tls
5136+
- test-snappy-compression
5137+
- test-zstd-1.x-compression
5138+
- test-zstd-2.x-compression
51025139
- test-tls-support-latest
51035140
- test-tls-support-8.0
51045141
- test-tls-support-7.0
@@ -5143,6 +5180,9 @@ buildvariants:
51435180
- test-latest-server-v1-api
51445181
- test-socks5
51455182
- test-socks5-tls
5183+
- test-snappy-compression
5184+
- test-zstd-1.x-compression
5185+
- test-zstd-2.x-compression
51465186
- test-tls-support-latest
51475187
- test-tls-support-8.0
51485188
- test-tls-support-7.0
@@ -5187,8 +5227,9 @@ buildvariants:
51875227
- test-latest-server-v1-api
51885228
- test-socks5
51895229
- test-socks5-tls
5190-
- test-zstd-compression
51915230
- test-snappy-compression
5231+
- test-zstd-1.x-compression
5232+
- test-zstd-2.x-compression
51925233
- test-tls-support-latest
51935234
- test-tls-support-8.0
51945235
- test-tls-support-7.0

‎.evergreen/generate_evergreen_tasks.js

+54-26
Original file line numberDiff line numberDiff line change
@@ -211,23 +211,60 @@ TASKS.push(
211211
]
212212
);
213213

214-
for (const compressor of ['zstd', 'snappy']) {
215-
TASKS.push({
216-
name: `test-${compressor}-compression`,
217-
tags: ['latest', compressor],
218-
commands: [
219-
updateExpansions({
220-
VERSION: 'latest',
221-
TOPOLOGY: 'replica_set',
222-
AUTH: 'auth',
223-
COMPRESSOR: compressor
224-
}),
225-
{ func: 'install dependencies' },
226-
{ func: 'bootstrap mongo-orchestration' },
227-
{ func: 'run-compression-tests' }
228-
]
229-
});
230-
}
214+
TASKS.push({
215+
name: `test-snappy-compression`,
216+
tags: ['latest', 'snappy'],
217+
commands: [
218+
updateExpansions({
219+
VERSION: 'latest',
220+
TOPOLOGY: 'replica_set',
221+
AUTH: 'auth',
222+
COMPRESSOR: 'snappy'
223+
}),
224+
{ func: 'install dependencies' },
225+
{ func: 'bootstrap mongo-orchestration' },
226+
{ func: 'run-compression-tests' }
227+
]
228+
});
229+
230+
TASKS.push({
231+
name: `test-zstd-1.x-compression`,
232+
tags: ['latest', 'zstd'],
233+
commands: [
234+
updateExpansions({
235+
VERSION: 'latest',
236+
TOPOLOGY: 'replica_set',
237+
AUTH: 'auth',
238+
COMPRESSOR: 'zstd'
239+
}),
240+
{ func: 'install dependencies' },
241+
{ func: 'bootstrap mongo-orchestration' },
242+
{
243+
func: 'install package',
244+
vars: {
245+
PACKAGE: '@mongodb-js/[email protected]'
246+
}
247+
},
248+
{ func: 'run-compression-tests' }
249+
]
250+
});
251+
252+
TASKS.push({
253+
name: `test-zstd-2.x-compression`,
254+
tags: ['latest', 'zstd'],
255+
commands: [
256+
updateExpansions({
257+
VERSION: 'latest',
258+
TOPOLOGY: 'replica_set',
259+
AUTH: 'auth',
260+
COMPRESSOR: 'zstd'
261+
}),
262+
{ func: 'install dependencies' },
263+
{ func: 'bootstrap mongo-orchestration' },
264+
// no need to manually install zstd - we specify 2.x as a dev dependency in package.json
265+
{ func: 'run-compression-tests' }
266+
]
267+
});
231268

232269
const AWS_LAMBDA_HANDLER_TASKS = [];
233270
// Add task for testing lambda example without aws auth.
@@ -766,15 +803,6 @@ BUILD_VARIANTS.push({
766803
tasks: ['.resource-management']
767804
});
768805

769-
// TODO(NODE-4575): unskip zstd and snappy on node 16
770-
for (const variant of BUILD_VARIANTS.filter(
771-
variant => variant.expansions && [16, 18, 20].includes(variant.expansions.NODE_LTS_VERSION)
772-
)) {
773-
variant.tasks = variant.tasks.filter(
774-
name => !['test-zstd-compression', 'test-snappy-compression'].includes(name)
775-
);
776-
}
777-
778806
// TODO(NODE-4897): Debug socks5 tests on node latest
779807
for (const variant of BUILD_VARIANTS.filter(
780808
variant => variant.expansions && ['latest'].includes(variant.expansions.NODE_LTS_VERSION)

0 commit comments

Comments
 (0)