Skip to content

Commit 19fd836

Browse files
nbbeekennbbeeken
committed
fix: gen config
1 parent e1bbf47 commit 19fd836

File tree

5 files changed

+51
-257
lines changed

5 files changed

+51
-257
lines changed

‎.evergreen/config.in.yml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -409,43 +409,6 @@ functions:
409409
args:
410410
- "${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh"
411411

412-
###########################################
413-
# mongosh functions
414-
###########################################
415-
"compile mongosh":
416-
- command: subprocess.exec
417-
params:
418-
working_dir: src
419-
env:
420-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
421-
TASK_ID: ${task_id}
422-
binary: bash
423-
args:
424-
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"
425-
426-
"run mongosh tests for package":
427-
- command: subprocess.exec
428-
params:
429-
working_dir: src
430-
env:
431-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
432-
TASK_ID: ${task_id}
433-
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
434-
binary: bash
435-
args:
436-
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh"
437-
438-
"run mongosh package scope test":
439-
- command: subprocess.exec
440-
params:
441-
working_dir: src
442-
env:
443-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
444-
TASK_ID: ${task_id}
445-
binary: bash
446-
args:
447-
- "${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh"
448-
449412
"reset aws instance profile":
450413
- command: shell.exec
451414
params:

‎.evergreen/config.yml

Lines changed: 50 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -368,37 +368,6 @@ functions:
368368
binary: bash
369369
args:
370370
- ${PROJECT_DIRECTORY}/.evergreen/run-typescript.sh
371-
compile mongosh:
372-
- command: subprocess.exec
373-
params:
374-
working_dir: src
375-
env:
376-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
377-
TASK_ID: ${task_id}
378-
binary: bash
379-
args:
380-
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
381-
run mongosh tests for package:
382-
- command: subprocess.exec
383-
params:
384-
working_dir: src
385-
env:
386-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
387-
TASK_ID: ${task_id}
388-
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_package}
389-
binary: bash
390-
args:
391-
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-integration-tests.sh
392-
run mongosh package scope test:
393-
- command: subprocess.exec
394-
params:
395-
working_dir: src
396-
env:
397-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
398-
TASK_ID: ${task_id}
399-
binary: bash
400-
args:
401-
- ${PROJECT_DIRECTORY}/.evergreen/run-mongosh-scope-test.sh
402371
reset aws instance profile:
403372
- command: shell.exec
404373
params:
@@ -448,14 +417,14 @@ functions:
448417
chmod +x $i
449418
done
450419
install dependencies:
451-
- command: shell.exec
420+
- command: subprocess.exec
452421
type: setup
453422
params:
454423
working_dir: src
455-
script: |
456-
${PREPARE_SHELL}
457-
NODE_LTS_VERSION=${NODE_LTS_VERSION} NPM_OPTIONS=${NPM_OPTIONS} NPM_VERSION=${NPM_VERSION}\
458-
bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
424+
binary: bash
425+
add_expansions_to_env: true
426+
args:
427+
- .evergreen/install-dependencies.sh
459428
install aws-credential-providers:
460429
- command: shell.exec
461430
type: setup
@@ -1072,24 +1041,29 @@ tasks:
10721041
- performance
10731042
exec_timeout_secs: 3600
10741043
commands:
1044+
- command: expansions.update
1045+
type: setup
1046+
params:
1047+
updates:
1048+
- {key: NODE_LTS_VERSION, value: v18.16.0}
1049+
- {key: NPM_VERSION, value: '9'}
1050+
- {key: VERSION, value: v6.0-perf}
1051+
- {key: TOPOLOGY, value: server}
1052+
- {key: AUTH, value: noauth}
10751053
- func: install dependencies
1076-
vars:
1077-
NODE_LTS_VERSION: v18.16.0
1078-
NPM_VERSION: 9
10791054
- func: bootstrap mongo-orchestration
1080-
vars:
1081-
VERSION: v6.0-perf
1082-
TOPOLOGY: server
1083-
AUTH: noauth
10841055
- func: run spec driver benchmarks
10851056
- command: perf.send
10861057
params:
10871058
file: src/results.json
10881059
- name: test-gcpkms-task
10891060
commands:
1061+
- command: expansions.update
1062+
type: setup
1063+
params:
1064+
updates:
1065+
- {key: NPM_VERSION, value: '9'}
10901066
- func: install dependencies
1091-
vars:
1092-
NPM_VERSION: 9
10931067
- command: subprocess.exec
10941068
type: setup
10951069
params:
@@ -1118,14 +1092,16 @@ tasks:
11181092
- ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh
11191093
- name: test-gcpkms-fail-task
11201094
commands:
1095+
- command: expansions.update
1096+
type: setup
1097+
params:
1098+
updates:
1099+
- {key: NPM_VERSION, value: '9'}
1100+
- {key: VERSION, value: latest}
1101+
- {key: TOPOLOGY, value: server}
1102+
- {key: AUTH, value: noauth}
11211103
- func: install dependencies
1122-
vars:
1123-
NPM_VERSION: 9
11241104
- func: bootstrap mongo-orchestration
1125-
vars:
1126-
VERSION: latest
1127-
TOPOLOGY: server
1128-
AUTH: noauth
11291105
- command: subprocess.exec
11301106
type: test
11311107
params:
@@ -1136,9 +1112,12 @@ tasks:
11361112
- src/.evergreen/run-gcp-kms-tests.sh
11371113
- name: test-azurekms-task
11381114
commands:
1115+
- command: expansions.update
1116+
type: setup
1117+
params:
1118+
updates:
1119+
- {key: NPM_VERSION, value: '9'}
11391120
- func: install dependencies
1140-
vars:
1141-
NPM_VERSION: 9
11421121
- command: subprocess.exec
11431122
type: setup
11441123
params:
@@ -1158,14 +1137,16 @@ tasks:
11581137
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
11591138
- name: test-azurekms-fail-task
11601139
commands:
1140+
- command: expansions.update
1141+
type: setup
1142+
params:
1143+
updates:
1144+
- {key: NPM_VERSION, value: '9'}
1145+
- {key: VERSION, value: latest}
1146+
- {key: TOPOLOGY, value: server}
1147+
- {key: AUTH, value: noauth}
11611148
- func: install dependencies
1162-
vars:
1163-
NPM_VERSION: 9
11641149
- func: bootstrap mongo-orchestration
1165-
vars:
1166-
VERSION: latest
1167-
TOPOLOGY: server
1168-
AUTH: noauth
11691150
- command: subprocess.exec
11701151
type: test
11711152
params:
@@ -1176,9 +1157,12 @@ tasks:
11761157
- src/.evergreen/run-azure-kms-tests.sh
11771158
- name: oidc-auth-test-azure-latest
11781159
commands:
1160+
- command: expansions.update
1161+
type: setup
1162+
params:
1163+
updates:
1164+
- {key: NPM_VERSION, value: '9'}
11791165
- func: install dependencies
1180-
vars:
1181-
NPM_VERSION: 9
11821166
- command: subprocess.exec
11831167
params:
11841168
working_dir: src
@@ -1192,9 +1176,12 @@ tasks:
11921176
- .evergreen/run-oidc-tests-azure.sh
11931177
- name: test-aws-lambda-deployed
11941178
commands:
1179+
- command: expansions.update
1180+
type: setup
1181+
params:
1182+
updates:
1183+
- {key: NPM_VERSION, value: '9'}
11951184
- func: install dependencies
1196-
vars:
1197-
NPM_VERSION: 9
11981185
- command: ec2.assume_role
11991186
params:
12001187
role_arn: ${LAMBDA_AWS_ROLE_ARN}
@@ -3383,96 +3370,6 @@ tasks:
33833370
- func: run tests
33843371
vars:
33853372
TEST_NPM_SCRIPT: check:csfle
3386-
- name: run-mongosh-browser-runtime-electron
3387-
tags:
3388-
- run-mongosh-integration-tests
3389-
depends_on: compile-mongosh
3390-
commands:
3391-
- func: install dependencies
3392-
vars:
3393-
NODE_LTS_VERSION: 16
3394-
NPM_VERSION: 9
3395-
- func: run mongosh tests for package
3396-
vars:
3397-
mongosh_package: browser-runtime-electron
3398-
- name: run-mongosh-cli-repl
3399-
tags:
3400-
- run-mongosh-integration-tests
3401-
depends_on: compile-mongosh
3402-
commands:
3403-
- func: install dependencies
3404-
vars:
3405-
NODE_LTS_VERSION: 16
3406-
NPM_VERSION: 9
3407-
- func: run mongosh tests for package
3408-
vars:
3409-
mongosh_package: cli-repl
3410-
- name: run-mongosh-connectivity-tests
3411-
tags:
3412-
- run-mongosh-integration-tests
3413-
depends_on: compile-mongosh
3414-
commands:
3415-
- func: install dependencies
3416-
vars:
3417-
NODE_LTS_VERSION: 16
3418-
NPM_VERSION: 9
3419-
- func: run mongosh tests for package
3420-
vars:
3421-
mongosh_package: connectivity-tests
3422-
- name: run-mongosh-mongosh
3423-
tags:
3424-
- run-mongosh-integration-tests
3425-
depends_on: compile-mongosh
3426-
commands:
3427-
- func: install dependencies
3428-
vars:
3429-
NODE_LTS_VERSION: 16
3430-
NPM_VERSION: 9
3431-
- func: run mongosh tests for package
3432-
vars:
3433-
mongosh_package: mongosh
3434-
- name: run-mongosh-node-runtime-worker-thread
3435-
tags:
3436-
- run-mongosh-integration-tests
3437-
depends_on: compile-mongosh
3438-
commands:
3439-
- func: install dependencies
3440-
vars:
3441-
NODE_LTS_VERSION: 16
3442-
NPM_VERSION: 9
3443-
- func: run mongosh tests for package
3444-
vars:
3445-
mongosh_package: node-runtime-worker-thread
3446-
- name: run-mongosh-service-provider-server
3447-
tags:
3448-
- run-mongosh-integration-tests
3449-
depends_on: compile-mongosh
3450-
commands:
3451-
- func: install dependencies
3452-
vars:
3453-
NODE_LTS_VERSION: 16
3454-
NPM_VERSION: 9
3455-
- func: run mongosh tests for package
3456-
vars:
3457-
mongosh_package: service-provider-server
3458-
- name: compile-mongosh
3459-
tags:
3460-
- run-mongosh-integration-tests
3461-
commands:
3462-
- func: install dependencies
3463-
vars:
3464-
NODE_LTS_VERSION: 16
3465-
NPM_VERSION: 9
3466-
- func: compile mongosh
3467-
- name: verify-mongosh-scopes
3468-
tags:
3469-
- run-mongosh-integration-tests
3470-
commands:
3471-
- func: install dependencies
3472-
vars:
3473-
NODE_LTS_VERSION: 16
3474-
NPM_VERSION: 9
3475-
- func: run mongosh package scope test
34763373
task_groups:
34773374
- name: serverless_task_group
34783375
setup_group_can_fail_task: true
@@ -4078,18 +3975,6 @@ buildvariants:
40783975
run_on: rhel80-large
40793976
tasks:
40803977
- download-and-merge-coverage
4081-
- name: mongosh_integration_tests
4082-
display_name: mongosh integration tests
4083-
run_on: ubuntu1804-large
4084-
tasks:
4085-
- run-mongosh-browser-runtime-electron
4086-
- run-mongosh-cli-repl
4087-
- run-mongosh-connectivity-tests
4088-
- run-mongosh-mongosh
4089-
- run-mongosh-node-runtime-worker-thread
4090-
- run-mongosh-service-provider-server
4091-
- compile-mongosh
4092-
- verify-mongosh-scopes
40933978
- name: ubuntu1804-test-mongodb-aws
40943979
display_name: MONGODB-AWS Auth test
40953980
run_on: ubuntu1804-large

‎.evergreen/generate_evergreen_tasks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,6 @@ fileData.buildvariants = (fileData.buildvariants || []).concat(BUILD_VARIANTS);
837837

838838
fs.writeFileSync(
839839
`${__dirname}/config.yml`,
840-
yaml.dump(fileData, { lineWidth: 120, noRefs: true }),
840+
yaml.dump(fileData, { lineWidth: 120, noRefs: true, flowLevel: 7, condenseFlow: false }),
841841
'utf8'
842842
);

‎.evergreen/run-mongosh-integration-tests.sh

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)