Skip to content

Commit cff00d0

Browse files
baileympearsonbaileympearson
committed
implementation
1 parent ae003ab commit cff00d0

18 files changed

+361
-320
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ command_type: system
1313
# That roughly accounts for variable system performance for various buildvariants
1414
exec_timeout_secs: 2100
1515

16+
patch_aliases:
17+
- alias: "nightly"
18+
variant_tags: ["nightly"]
19+
task_tags: [".*"]
20+
1621
# What to do when evergreen hits the timeout (`post:` tasks are run automatically)
1722
timeout:
1823
- command: subprocess.exec
@@ -272,10 +277,31 @@ functions:
272277
- command: shell.exec
273278
type: test
274279
params:
280+
shell: bash
275281
working_dir: src
276282
timeout_secs: 300
277283
script: |
278284
${PREPARE_SHELL}
285+
# Disable xtrace (just in case it was accidentally set).
286+
set +x
287+
288+
cat <<EOT > prepare_client_encryption.sh
289+
export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
290+
export RUN_WITH_MONGOCRYPTD=${RUN_WITH_MONGOCRYPTD}
291+
export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
292+
export FLE_AWS_KEY2='${FLE_AWS_KEY2}'
293+
export FLE_AWS_SECRET2='${FLE_AWS_SECRET2}'
294+
export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
295+
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
296+
export AWS_REGION='${AWS_REGION}'
297+
export AWS_CMK_ID='${AWS_CMK_ID}'
298+
export AWS_DEFAULT_REGION='us-east-1'
299+
export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
300+
export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
301+
EOT
302+
303+
source prepare_client_encryption.sh
304+
rm prepare_client_encryption.sh
279305
280306
MONGODB_URI="${MONGODB_URI}" \
281307
AUTH=${AUTH} \
@@ -475,8 +501,6 @@ functions:
475501
export AWS_CMK_ID='${AWS_CMK_ID}'
476502
export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
477503
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
478-
export CSFLE_GIT_REF='${CSFLE_GIT_REF}'
479-
export CDRIVER_GIT_REF='${CDRIVER_GIT_REF}'
480504
EOT
481505
- command: shell.exec
482506
type: test
@@ -914,8 +938,6 @@ functions:
914938
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
915939
export AWS_REGION='${AWS_REGION}'
916940
export AWS_CMK_ID='${AWS_CMK_ID}'
917-
export CSFLE_GIT_REF='${CSFLE_GIT_REF}'
918-
export CDRIVER_GIT_REF='${CDRIVER_GIT_REF}'
919941
EOT
920942
- command: shell.exec
921943
type: test
@@ -1074,6 +1096,18 @@ functions:
10741096
args:
10751097
- ${PROJECT_DIRECTORY}/.evergreen/run-x509-tests.sh
10761098

1099+
install mongodb-client-encryption:
1100+
- command: subprocess.exec
1101+
type: setup
1102+
params:
1103+
working_dir: "src"
1104+
env:
1105+
INSTALL_DIR: mongodb-client-encryption
1106+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1107+
binary: bash
1108+
args:
1109+
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
1110+
10771111
tasks:
10781112
- name: 'test-atlas-data-lake'
10791113
tags: ["datalake", "mongohouse"]

‎.evergreen/config.yml‎

Lines changed: 72 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
stepback: true
22
command_type: system
33
exec_timeout_secs: 2100
4+
patch_aliases:
5+
- alias: nightly
6+
variant_tags:
7+
- nightly
8+
task_tags:
9+
- .*
410
timeout:
511
- command: subprocess.exec
612
params:
@@ -241,10 +247,31 @@ functions:
241247
- command: shell.exec
242248
type: test
243249
params:
250+
shell: bash
244251
working_dir: src
245252
timeout_secs: 300
246253
script: |
247254
${PREPARE_SHELL}
255+
# Disable xtrace (just in case it was accidentally set).
256+
set +x
257+
258+
cat <<EOT > prepare_client_encryption.sh
259+
export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
260+
export RUN_WITH_MONGOCRYPTD=${RUN_WITH_MONGOCRYPTD}
261+
export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
262+
export FLE_AWS_KEY2='${FLE_AWS_KEY2}'
263+
export FLE_AWS_SECRET2='${FLE_AWS_SECRET2}'
264+
export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
265+
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
266+
export AWS_REGION='${AWS_REGION}'
267+
export AWS_CMK_ID='${AWS_CMK_ID}'
268+
export AWS_DEFAULT_REGION='us-east-1'
269+
export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
270+
export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
271+
EOT
272+
273+
source prepare_client_encryption.sh
274+
rm prepare_client_encryption.sh
248275
249276
MONGODB_URI="${MONGODB_URI}" \
250277
AUTH=${AUTH} \
@@ -428,8 +455,6 @@ functions:
428455
export AWS_CMK_ID='${AWS_CMK_ID}'
429456
export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
430457
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
431-
export CSFLE_GIT_REF='${CSFLE_GIT_REF}'
432-
export CDRIVER_GIT_REF='${CDRIVER_GIT_REF}'
433458
EOT
434459
- command: shell.exec
435460
type: test
@@ -886,8 +911,6 @@ functions:
886911
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
887912
export AWS_REGION='${AWS_REGION}'
888913
export AWS_CMK_ID='${AWS_CMK_ID}'
889-
export CSFLE_GIT_REF='${CSFLE_GIT_REF}'
890-
export CDRIVER_GIT_REF='${CDRIVER_GIT_REF}'
891914
EOT
892915
- command: shell.exec
893916
type: test
@@ -1035,6 +1058,17 @@ functions:
10351058
binary: bash
10361059
args:
10371060
- ${PROJECT_DIRECTORY}/.evergreen/run-x509-tests.sh
1061+
install mongodb-client-encryption:
1062+
- command: subprocess.exec
1063+
type: setup
1064+
params:
1065+
working_dir: src
1066+
env:
1067+
INSTALL_DIR: mongodb-client-encryption
1068+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1069+
binary: bash
1070+
args:
1071+
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
10381072
tasks:
10391073
- name: test-atlas-data-lake
10401074
tags:
@@ -3516,24 +3550,7 @@ tasks:
35163550
variant: '*'
35173551
status: '*'
35183552
patch_optional: true
3519-
- name: run-custom-csfle-tests-5.0-pinned-commit
3520-
tags:
3521-
- run-custom-dependency-tests
3522-
commands:
3523-
- command: expansions.update
3524-
type: setup
3525-
params:
3526-
updates:
3527-
- {key: NODE_LTS_VERSION, value: '16'}
3528-
- {key: NPM_VERSION, value: '9'}
3529-
- {key: VERSION, value: '5.0'}
3530-
- {key: TOPOLOGY, value: replica_set}
3531-
- {key: CSFLE_GIT_REF, value: 974a4614f8c1c3786e5e39fa63568d83f4f69ebd}
3532-
- func: install dependencies
3533-
- func: bootstrap mongo-orchestration
3534-
- func: bootstrap kms servers
3535-
- func: run custom csfle tests
3536-
- name: run-custom-csfle-tests-5.0-master
3553+
- name: run-custom-csfle-tests-5.0
35373554
tags:
35383555
- run-custom-dependency-tests
35393556
commands:
@@ -3545,29 +3562,12 @@ tasks:
35453562
- {key: NPM_VERSION, value: '9'}
35463563
- {key: VERSION, value: '5.0'}
35473564
- {key: TOPOLOGY, value: replica_set}
3548-
- {key: CSFLE_GIT_REF, value: master}
3549-
- func: install dependencies
3550-
- func: bootstrap mongo-orchestration
3551-
- func: bootstrap kms servers
3552-
- func: run custom csfle tests
3553-
- name: run-custom-csfle-tests-rapid-pinned-commit
3554-
tags:
3555-
- run-custom-dependency-tests
3556-
commands:
3557-
- command: expansions.update
3558-
type: setup
3559-
params:
3560-
updates:
3561-
- {key: NODE_LTS_VERSION, value: '16'}
3562-
- {key: NPM_VERSION, value: '9'}
3563-
- {key: VERSION, value: rapid}
3564-
- {key: TOPOLOGY, value: replica_set}
3565-
- {key: CSFLE_GIT_REF, value: 974a4614f8c1c3786e5e39fa63568d83f4f69ebd}
35663565
- func: install dependencies
35673566
- func: bootstrap mongo-orchestration
35683567
- func: bootstrap kms servers
3568+
- func: install mongodb-client-encryption
35693569
- func: run custom csfle tests
3570-
- name: run-custom-csfle-tests-rapid-master
3570+
- name: run-custom-csfle-tests-rapid
35713571
tags:
35723572
- run-custom-dependency-tests
35733573
commands:
@@ -3579,12 +3579,12 @@ tasks:
35793579
- {key: NPM_VERSION, value: '9'}
35803580
- {key: VERSION, value: rapid}
35813581
- {key: TOPOLOGY, value: replica_set}
3582-
- {key: CSFLE_GIT_REF, value: master}
35833582
- func: install dependencies
35843583
- func: bootstrap mongo-orchestration
35853584
- func: bootstrap kms servers
3585+
- func: install mongodb-client-encryption
35863586
- func: run custom csfle tests
3587-
- name: run-custom-csfle-tests-latest-pinned-commit
3587+
- name: run-custom-csfle-tests-latest
35883588
tags:
35893589
- run-custom-dependency-tests
35903590
commands:
@@ -3596,27 +3596,10 @@ tasks:
35963596
- {key: NPM_VERSION, value: '9'}
35973597
- {key: VERSION, value: latest}
35983598
- {key: TOPOLOGY, value: replica_set}
3599-
- {key: CSFLE_GIT_REF, value: 974a4614f8c1c3786e5e39fa63568d83f4f69ebd}
3600-
- func: install dependencies
3601-
- func: bootstrap mongo-orchestration
3602-
- func: bootstrap kms servers
3603-
- func: run custom csfle tests
3604-
- name: run-custom-csfle-tests-latest-master
3605-
tags:
3606-
- run-custom-dependency-tests
3607-
commands:
3608-
- command: expansions.update
3609-
type: setup
3610-
params:
3611-
updates:
3612-
- {key: NODE_LTS_VERSION, value: '16'}
3613-
- {key: NPM_VERSION, value: '9'}
3614-
- {key: VERSION, value: latest}
3615-
- {key: TOPOLOGY, value: replica_set}
3616-
- {key: CSFLE_GIT_REF, value: master}
36173599
- func: install dependencies
36183600
- func: bootstrap mongo-orchestration
36193601
- func: bootstrap kms servers
3602+
- func: install mongodb-client-encryption
36203603
- func: run custom csfle tests
36213604
- name: test-latest-driver-mongodb-client-encryption-6.0.0
36223605
tags:
@@ -4348,6 +4331,26 @@ tasks:
43484331
- func: bootstrap mongo-orchestration
43494332
- func: bootstrap kms servers
43504333
- func: run tests
4334+
- name: run-custom-csfle-tests-with-libmongocrypt-latest
4335+
tags:
4336+
- run-custom-dependency-tests
4337+
- nightly
4338+
commands:
4339+
- command: expansions.update
4340+
type: setup
4341+
params:
4342+
updates:
4343+
- {key: NODE_LTS_VERSION, value: '16'}
4344+
- {key: NPM_VERSION, value: '9'}
4345+
- {key: VERSION, value: '8.0'}
4346+
- {key: TOPOLOGY, value: replica_set}
4347+
- func: install dependencies
4348+
- func: bootstrap mongo-orchestration
4349+
- func: bootstrap kms servers
4350+
- func: install mongodb-client-encryption
4351+
vars:
4352+
LIBMONGOCRYPT_VERSION: latest
4353+
- func: run custom csfle tests
43514354
task_groups:
43524355
- name: serverless_task_group
43534356
setup_group_can_fail_task: true
@@ -5118,12 +5121,9 @@ buildvariants:
51185121
display_name: Custom Dependency Version Test
51195122
run_on: rhel80-large
51205123
tasks:
5121-
- run-custom-csfle-tests-5.0-pinned-commit
5122-
- run-custom-csfle-tests-5.0-master
5123-
- run-custom-csfle-tests-rapid-pinned-commit
5124-
- run-custom-csfle-tests-rapid-master
5125-
- run-custom-csfle-tests-latest-pinned-commit
5126-
- run-custom-csfle-tests-latest-master
5124+
- run-custom-csfle-tests-5.0
5125+
- run-custom-csfle-tests-rapid
5126+
- run-custom-csfle-tests-latest
51275127
- test-latest-driver-mongodb-client-encryption-6.0.0
51285128
- name: rhel8-test-serverless
51295129
display_name: Serverless Test
@@ -5217,3 +5217,8 @@ buildvariants:
52175217
run_on: rhel80-large
52185218
tasks:
52195219
- test_atlas_task_group_search_indexes
5220+
- name: nightly
5221+
display_name: Nightly Build
5222+
run_on: rhel80-large
5223+
tasks:
5224+
- .nightly

0 commit comments

Comments
 (0)