Skip to content

Commit d648287

Browse files
nbbeekennbbeeken
committed
fix: remove vars from .in file
1 parent ba687e9 commit d648287

File tree

2 files changed

+128
-68
lines changed

2 files changed

+128
-68
lines changed

‎.evergreen/config.in.yml

Lines changed: 55 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -502,14 +502,14 @@ functions:
502502
done
503503
504504
"install dependencies":
505-
- command: shell.exec
505+
- command: subprocess.exec
506506
type: setup
507507
params:
508508
working_dir: "src"
509-
script: |
510-
${PREPARE_SHELL}
511-
NODE_LTS_VERSION=${NODE_LTS_VERSION} NPM_OPTIONS=${NPM_OPTIONS} NPM_VERSION=${NPM_VERSION}\
512-
bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
509+
binary: bash
510+
add_expansions_to_env: true
511+
args:
512+
- .evergreen/install-dependencies.sh
513513

514514
"install aws-credential-providers":
515515
- command: shell.exec
@@ -1139,25 +1139,30 @@ tasks:
11391139
- performance
11401140
exec_timeout_secs: 3600
11411141
commands:
1142+
- command: expansions.update
1143+
type: setup
1144+
params:
1145+
updates:
1146+
- { key: NODE_LTS_VERSION, value: v18.16.0 }
1147+
- { key: NPM_VERSION, value: "9" }
1148+
- { key: VERSION, value: v6.0-perf }
1149+
- { key: TOPOLOGY, value: server }
1150+
- { key: AUTH, value: noauth }
11421151
- func: install dependencies
1143-
vars:
1144-
NODE_LTS_VERSION: v18.16.0
1145-
NPM_VERSION: 9
11461152
- func: bootstrap mongo-orchestration
1147-
vars:
1148-
VERSION: v6.0-perf
1149-
TOPOLOGY: server
1150-
AUTH: noauth
11511153
- func: run spec driver benchmarks
11521154
- command: perf.send
11531155
params:
11541156
file: src/results.json
11551157

11561158
- name: "test-gcpkms-task"
11571159
commands:
1160+
- command: expansions.update
1161+
type: setup
1162+
params:
1163+
updates:
1164+
- { key: NPM_VERSION, value: "9" }
11581165
- func: "install dependencies"
1159-
vars:
1160-
NPM_VERSION: 9
11611166
# Upload node driver to a GCP instance
11621167
- command: subprocess.exec
11631168
type: setup
@@ -1191,14 +1196,16 @@ tasks:
11911196
# test-gcpkms-fail-task runs in a non-GCE environment.
11921197
# It is expected to fail to obtain GCE credentials.
11931198
commands:
1199+
- command: expansions.update
1200+
type: setup
1201+
params:
1202+
updates:
1203+
- { key: NPM_VERSION, value: "9" }
1204+
- { key: VERSION, value: latest }
1205+
- { key: TOPOLOGY, value: server }
1206+
- { key: AUTH, value: noauth }
11941207
- func: "install dependencies"
1195-
vars:
1196-
NPM_VERSION: 9
11971208
- func: bootstrap mongo-orchestration
1198-
vars:
1199-
VERSION: latest
1200-
TOPOLOGY: server
1201-
AUTH: noauth
12021209
- command: subprocess.exec
12031210
type: test
12041211
params:
@@ -1210,9 +1217,12 @@ tasks:
12101217

12111218
- name: "test-azurekms-task"
12121219
commands:
1220+
- command: expansions.update
1221+
type: setup
1222+
params:
1223+
updates:
1224+
- { key: NPM_VERSION, value: "9" }
12131225
- func: "install dependencies"
1214-
vars:
1215-
NPM_VERSION: 9
12161226
- command: subprocess.exec
12171227
type: setup
12181228
params:
@@ -1233,14 +1243,16 @@ tasks:
12331243

12341244
- name: "test-azurekms-fail-task"
12351245
commands:
1246+
- command: expansions.update
1247+
type: setup
1248+
params:
1249+
updates:
1250+
- { key: NPM_VERSION, value: "9" }
1251+
- { key: VERSION, value: latest }
1252+
- { key: TOPOLOGY, value: server }
1253+
- { key: AUTH, value: noauth }
12361254
- func: "install dependencies"
1237-
vars:
1238-
NPM_VERSION: 9
12391255
- func: bootstrap mongo-orchestration
1240-
vars:
1241-
VERSION: latest
1242-
TOPOLOGY: server
1243-
AUTH: noauth
12441256
- command: subprocess.exec
12451257
type: test
12461258
params:
@@ -1252,9 +1264,12 @@ tasks:
12521264

12531265
- name: "oidc-auth-test-azure-latest"
12541266
commands:
1267+
- command: expansions.update
1268+
type: setup
1269+
params:
1270+
updates:
1271+
- { key: NPM_VERSION, value: "9" }
12551272
- func: "install dependencies"
1256-
vars:
1257-
NPM_VERSION: 9
12581273
- command: subprocess.exec
12591274
params:
12601275
working_dir: src
@@ -1269,9 +1284,12 @@ tasks:
12691284

12701285
- name: "test-aws-lambda-deployed"
12711286
commands:
1287+
- command: expansions.update
1288+
type: setup
1289+
params:
1290+
updates:
1291+
- { key: NPM_VERSION, value: "9" }
12721292
- func: "install dependencies"
1273-
vars:
1274-
NPM_VERSION: 9
12751293
- command: ec2.assume_role
12761294
params:
12771295
role_arn: ${LAMBDA_AWS_ROLE_ARN}
@@ -1289,9 +1307,12 @@ tasks:
12891307

12901308
- name: test-search-index-helpers
12911309
commands:
1310+
- command: expansions.update
1311+
type: setup
1312+
params:
1313+
updates:
1314+
- { key: NODE_LTS_VERSION, value: "20" }
12921315
- func: install dependencies
1293-
vars:
1294-
NODE_LTS_VERSION: 20
12951316
- command: subprocess.exec
12961317
params:
12971318
working_dir: src

‎.evergreen/config.yml

Lines changed: 73 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,14 @@ functions:
450450
chmod +x $i
451451
done
452452
install dependencies:
453-
- command: shell.exec
453+
- command: subprocess.exec
454454
type: setup
455455
params:
456456
working_dir: src
457-
script: |
458-
${PREPARE_SHELL}
459-
NODE_LTS_VERSION=${NODE_LTS_VERSION} NPM_OPTIONS=${NPM_OPTIONS} NPM_VERSION=${NPM_VERSION}\
460-
bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
457+
binary: bash
458+
add_expansions_to_env: true
459+
args:
460+
- .evergreen/install-dependencies.sh
461461
install aws-credential-providers:
462462
- command: shell.exec
463463
type: setup
@@ -1076,24 +1076,35 @@ tasks:
10761076
- performance
10771077
exec_timeout_secs: 3600
10781078
commands:
1079+
- command: expansions.update
1080+
type: setup
1081+
params:
1082+
updates:
1083+
- key: NODE_LTS_VERSION
1084+
value: v18.16.0
1085+
- key: NPM_VERSION
1086+
value: '9'
1087+
- key: VERSION
1088+
value: v6.0-perf
1089+
- key: TOPOLOGY
1090+
value: server
1091+
- key: AUTH
1092+
value: noauth
10791093
- func: install dependencies
1080-
vars:
1081-
NODE_LTS_VERSION: v18.16.0
1082-
NPM_VERSION: 9
10831094
- func: bootstrap mongo-orchestration
1084-
vars:
1085-
VERSION: v6.0-perf
1086-
TOPOLOGY: server
1087-
AUTH: noauth
10881095
- func: run spec driver benchmarks
10891096
- command: perf.send
10901097
params:
10911098
file: src/results.json
10921099
- name: test-gcpkms-task
10931100
commands:
1101+
- command: expansions.update
1102+
type: setup
1103+
params:
1104+
updates:
1105+
- key: NPM_VERSION
1106+
value: '9'
10941107
- func: install dependencies
1095-
vars:
1096-
NPM_VERSION: 9
10971108
- command: subprocess.exec
10981109
type: setup
10991110
params:
@@ -1122,14 +1133,20 @@ tasks:
11221133
- ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh
11231134
- name: test-gcpkms-fail-task
11241135
commands:
1136+
- command: expansions.update
1137+
type: setup
1138+
params:
1139+
updates:
1140+
- key: NPM_VERSION
1141+
value: '9'
1142+
- key: VERSION
1143+
value: latest
1144+
- key: TOPOLOGY
1145+
value: server
1146+
- key: AUTH
1147+
value: noauth
11251148
- func: install dependencies
1126-
vars:
1127-
NPM_VERSION: 9
11281149
- func: bootstrap mongo-orchestration
1129-
vars:
1130-
VERSION: latest
1131-
TOPOLOGY: server
1132-
AUTH: noauth
11331150
- command: subprocess.exec
11341151
type: test
11351152
params:
@@ -1140,9 +1157,13 @@ tasks:
11401157
- src/.evergreen/run-gcp-kms-tests.sh
11411158
- name: test-azurekms-task
11421159
commands:
1160+
- command: expansions.update
1161+
type: setup
1162+
params:
1163+
updates:
1164+
- key: NPM_VERSION
1165+
value: '9'
11431166
- func: install dependencies
1144-
vars:
1145-
NPM_VERSION: 9
11461167
- command: subprocess.exec
11471168
type: setup
11481169
params:
@@ -1162,14 +1183,20 @@ tasks:
11621183
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
11631184
- name: test-azurekms-fail-task
11641185
commands:
1186+
- command: expansions.update
1187+
type: setup
1188+
params:
1189+
updates:
1190+
- key: NPM_VERSION
1191+
value: '9'
1192+
- key: VERSION
1193+
value: latest
1194+
- key: TOPOLOGY
1195+
value: server
1196+
- key: AUTH
1197+
value: noauth
11651198
- func: install dependencies
1166-
vars:
1167-
NPM_VERSION: 9
11681199
- func: bootstrap mongo-orchestration
1169-
vars:
1170-
VERSION: latest
1171-
TOPOLOGY: server
1172-
AUTH: noauth
11731200
- command: subprocess.exec
11741201
type: test
11751202
params:
@@ -1180,9 +1207,13 @@ tasks:
11801207
- src/.evergreen/run-azure-kms-tests.sh
11811208
- name: oidc-auth-test-azure-latest
11821209
commands:
1210+
- command: expansions.update
1211+
type: setup
1212+
params:
1213+
updates:
1214+
- key: NPM_VERSION
1215+
value: '9'
11831216
- func: install dependencies
1184-
vars:
1185-
NPM_VERSION: 9
11861217
- command: subprocess.exec
11871218
params:
11881219
working_dir: src
@@ -1196,9 +1227,13 @@ tasks:
11961227
- .evergreen/run-oidc-tests-azure.sh
11971228
- name: test-aws-lambda-deployed
11981229
commands:
1230+
- command: expansions.update
1231+
type: setup
1232+
params:
1233+
updates:
1234+
- key: NPM_VERSION
1235+
value: '9'
11991236
- func: install dependencies
1200-
vars:
1201-
NPM_VERSION: 9
12021237
- command: ec2.assume_role
12031238
params:
12041239
role_arn: ${LAMBDA_AWS_ROLE_ARN}
@@ -1215,9 +1250,13 @@ tasks:
12151250
AWS_REGION: us-east-1
12161251
- name: test-search-index-helpers
12171252
commands:
1253+
- command: expansions.update
1254+
type: setup
1255+
params:
1256+
updates:
1257+
- key: NODE_LTS_VERSION
1258+
value: '20'
12181259
- func: install dependencies
1219-
vars:
1220-
NODE_LTS_VERSION: 20
12211260
- command: subprocess.exec
12221261
params:
12231262
working_dir: src

0 commit comments

Comments
 (0)