File tree Expand file tree Collapse file tree 4 files changed +19
-49
lines changed Expand file tree Collapse file tree 4 files changed +19
-49
lines changed Original file line number Diff line number Diff line change @@ -1169,17 +1169,7 @@ tasks:
1169
1169
binary : bash
1170
1170
add_expansions_to_env : true
1171
1171
args :
1172
- - src/.evergreen/copy-driver-to-azure.sh
1173
- - command : subprocess.exec
1174
- type : test
1175
- params :
1176
- working_dir : src
1177
- binary : bash
1178
- add_expansions_to_env : true
1179
- env :
1180
- AZUREKMS_CMD : " env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
1181
- args :
1182
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
1172
+ - src/.evergreen/copy-driver-to-azure-and-run.sh
1183
1173
1184
1174
- name : " test-azurekms-fail-task"
1185
1175
commands :
@@ -1300,9 +1290,10 @@ task_groups:
1300
1290
params :
1301
1291
working_dir : " src"
1302
1292
binary : bash
1303
- add_expansions_to_env : true
1293
+ env :
1294
+ AZUREKMS_VMNAME_PREFIX : " NODE_DRIVER"
1304
1295
args :
1305
- - .evergreen/setup-azure-vm .sh
1296
+ - ${DRIVERS_TOOLS}/ .evergreen/csfle/azurekms/ setup.sh
1306
1297
- command : expansions.update
1307
1298
# Load AZUREKMS_VMNAME into the expansions.
1308
1299
params :
@@ -1318,7 +1309,7 @@ task_groups:
1318
1309
binary : bash
1319
1310
add_expansions_to_env : true
1320
1311
args :
1321
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm .sh
1312
+ - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown .sh
1322
1313
tasks :
1323
1314
- test-azurekms-task
1324
1315
Original file line number Diff line number Diff line change @@ -1125,17 +1125,7 @@ tasks:
1125
1125
binary : bash
1126
1126
add_expansions_to_env : true
1127
1127
args :
1128
- - src/.evergreen/copy-driver-to-azure.sh
1129
- - command : subprocess.exec
1130
- type : test
1131
- params :
1132
- working_dir : src
1133
- binary : bash
1134
- add_expansions_to_env : true
1135
- env :
1136
- AZUREKMS_CMD : env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh
1137
- args :
1138
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
1128
+ - src/.evergreen/copy-driver-to-azure-and-run.sh
1139
1129
- name : test-azurekms-fail-task
1140
1130
commands :
1141
1131
- command : expansions.update
@@ -3624,9 +3614,10 @@ task_groups:
3624
3614
params :
3625
3615
working_dir : src
3626
3616
binary : bash
3627
- add_expansions_to_env : true
3617
+ env :
3618
+ AZUREKMS_VMNAME_PREFIX : NODE_DRIVER
3628
3619
args :
3629
- - .evergreen/setup-azure-vm .sh
3620
+ - ${DRIVERS_TOOLS}/ .evergreen/csfle/azurekms/ setup.sh
3630
3621
- command : expansions.update
3631
3622
params :
3632
3623
file : src/testazurekms-expansions.yml
@@ -3639,7 +3630,7 @@ task_groups:
3639
3630
binary : bash
3640
3631
add_expansions_to_env : true
3641
3632
args :
3642
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm .sh
3633
+ - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown .sh
3643
3634
tasks :
3644
3635
- test-azurekms-task
3645
3636
- name : test_atlas_task_group
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
3
set -o errexit
4
+ source " ${DRIVERS_TOOLS} /.evergreen/csfle/azurekms/secrets-export.sh"
4
5
5
6
if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo " AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi
6
7
if [ -z ${AZUREKMS_VMNAME+omitted} ]; then echo " AZUREKMS_VMNAME is unset" && exit 1; fi
7
- if [ -z ${AZUREKMS_PRIVATEKEYPATH+omitted} ]; then echo " AZUREKMS_PRIVATEKEYPATH is unset" && exit 1; fi
8
8
9
9
source " ${PROJECT_DIRECTORY} /.evergreen/init-node-and-npm-env.sh"
10
10
11
+ export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
12
+ export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
13
+
11
14
echo " compressing node driver source ... begin"
12
15
tar -czf node-driver-source.tgz src
13
16
echo " compressing node driver source ... end"
@@ -22,3 +25,8 @@ echo "decompressing node driver tar on azure ... begin"
22
25
export AZUREKMS_CMD=" tar xf node-driver-source.tgz"
23
26
" ${DRIVERS_TOOLS} /.evergreen/csfle/azurekms/run-command.sh"
24
27
echo " decompressing node driver tar on azure ... end"
28
+
29
+ echo " Running test ... begin"
30
+ export AZUREKMS_CMD=" env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
31
+ ${DRIVERS_TOOLS} /.evergreen/csfle/azurekms/run-command.sh
32
+ echo " Running test ... end"
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments