Skip to content

Commit 62b6149

Browse files
baileympearsonbaileympearson
committed
rest of changes
1 parent ae003ab commit 62b6149

18 files changed

+337
-319
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 17 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
@@ -475,8 +480,6 @@ functions:
475480
export AWS_CMK_ID='${AWS_CMK_ID}'
476481
export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
477482
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}'
480483
EOT
481484
- command: shell.exec
482485
type: test
@@ -914,8 +917,6 @@ functions:
914917
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
915918
export AWS_REGION='${AWS_REGION}'
916919
export AWS_CMK_ID='${AWS_CMK_ID}'
917-
export CSFLE_GIT_REF='${CSFLE_GIT_REF}'
918-
export CDRIVER_GIT_REF='${CDRIVER_GIT_REF}'
919920
EOT
920921
- command: shell.exec
921922
type: test
@@ -1074,6 +1075,18 @@ functions:
10741075
args:
10751076
- ${PROJECT_DIRECTORY}/.evergreen/run-x509-tests.sh
10761077

1078+
install mongodb-client-encryption:
1079+
- command: subprocess.exec
1080+
type: setup
1081+
params:
1082+
working_dir: "src"
1083+
env:
1084+
INSTALL_DIR: mongodb-client-encryption
1085+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1086+
binary: bash
1087+
args:
1088+
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
1089+
10771090
tasks:
10781091
- name: 'test-atlas-data-lake'
10791092
tags: ["datalake", "mongohouse"]

‎.evergreen/config.yml‎

Lines changed: 51 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:
@@ -428,8 +434,6 @@ functions:
428434
export AWS_CMK_ID='${AWS_CMK_ID}'
429435
export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
430436
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}'
433437
EOT
434438
- command: shell.exec
435439
type: test
@@ -886,8 +890,6 @@ functions:
886890
export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
887891
export AWS_REGION='${AWS_REGION}'
888892
export AWS_CMK_ID='${AWS_CMK_ID}'
889-
export CSFLE_GIT_REF='${CSFLE_GIT_REF}'
890-
export CDRIVER_GIT_REF='${CDRIVER_GIT_REF}'
891893
EOT
892894
- command: shell.exec
893895
type: test
@@ -1035,6 +1037,17 @@ functions:
10351037
binary: bash
10361038
args:
10371039
- ${PROJECT_DIRECTORY}/.evergreen/run-x509-tests.sh
1040+
install mongodb-client-encryption:
1041+
- command: subprocess.exec
1042+
type: setup
1043+
params:
1044+
working_dir: src
1045+
env:
1046+
INSTALL_DIR: mongodb-client-encryption
1047+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1048+
binary: bash
1049+
args:
1050+
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
10381051
tasks:
10391052
- name: test-atlas-data-lake
10401053
tags:
@@ -3516,24 +3529,7 @@ tasks:
35163529
variant: '*'
35173530
status: '*'
35183531
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
3532+
- name: run-custom-csfle-tests-5.0
35373533
tags:
35383534
- run-custom-dependency-tests
35393535
commands:
@@ -3545,12 +3541,12 @@ tasks:
35453541
- {key: NPM_VERSION, value: '9'}
35463542
- {key: VERSION, value: '5.0'}
35473543
- {key: TOPOLOGY, value: replica_set}
3548-
- {key: CSFLE_GIT_REF, value: master}
35493544
- func: install dependencies
35503545
- func: bootstrap mongo-orchestration
35513546
- func: bootstrap kms servers
3547+
- func: install mongodb-client-encryption
35523548
- func: run custom csfle tests
3553-
- name: run-custom-csfle-tests-rapid-pinned-commit
3549+
- name: run-custom-csfle-tests-rapid
35543550
tags:
35553551
- run-custom-dependency-tests
35563552
commands:
@@ -3562,46 +3558,12 @@ tasks:
35623558
- {key: NPM_VERSION, value: '9'}
35633559
- {key: VERSION, value: rapid}
35643560
- {key: TOPOLOGY, value: replica_set}
3565-
- {key: CSFLE_GIT_REF, value: 974a4614f8c1c3786e5e39fa63568d83f4f69ebd}
35663561
- func: install dependencies
35673562
- func: bootstrap mongo-orchestration
35683563
- func: bootstrap kms servers
3564+
- func: install mongodb-client-encryption
35693565
- func: run custom csfle tests
3570-
- name: run-custom-csfle-tests-rapid-master
3571-
tags:
3572-
- run-custom-dependency-tests
3573-
commands:
3574-
- command: expansions.update
3575-
type: setup
3576-
params:
3577-
updates:
3578-
- {key: NODE_LTS_VERSION, value: '16'}
3579-
- {key: NPM_VERSION, value: '9'}
3580-
- {key: VERSION, value: rapid}
3581-
- {key: TOPOLOGY, value: replica_set}
3582-
- {key: CSFLE_GIT_REF, value: master}
3583-
- func: install dependencies
3584-
- func: bootstrap mongo-orchestration
3585-
- func: bootstrap kms servers
3586-
- func: run custom csfle tests
3587-
- name: run-custom-csfle-tests-latest-pinned-commit
3588-
tags:
3589-
- run-custom-dependency-tests
3590-
commands:
3591-
- command: expansions.update
3592-
type: setup
3593-
params:
3594-
updates:
3595-
- {key: NODE_LTS_VERSION, value: '16'}
3596-
- {key: NPM_VERSION, value: '9'}
3597-
- {key: VERSION, value: latest}
3598-
- {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
3566+
- name: run-custom-csfle-tests-latest
36053567
tags:
36063568
- run-custom-dependency-tests
36073569
commands:
@@ -3613,10 +3575,10 @@ tasks:
36133575
- {key: NPM_VERSION, value: '9'}
36143576
- {key: VERSION, value: latest}
36153577
- {key: TOPOLOGY, value: replica_set}
3616-
- {key: CSFLE_GIT_REF, value: master}
36173578
- func: install dependencies
36183579
- func: bootstrap mongo-orchestration
36193580
- func: bootstrap kms servers
3581+
- func: install mongodb-client-encryption
36203582
- func: run custom csfle tests
36213583
- name: test-latest-driver-mongodb-client-encryption-6.0.0
36223584
tags:
@@ -4348,6 +4310,26 @@ tasks:
43484310
- func: bootstrap mongo-orchestration
43494311
- func: bootstrap kms servers
43504312
- func: run tests
4313+
- name: run-custom-csfle-tests-with-libmongocrypt-latest
4314+
tags:
4315+
- run-custom-dependency-tests
4316+
- nightly
4317+
commands:
4318+
- command: expansions.update
4319+
type: setup
4320+
params:
4321+
updates:
4322+
- {key: NODE_LTS_VERSION, value: '16'}
4323+
- {key: NPM_VERSION, value: '9'}
4324+
- {key: VERSION, value: '8.0'}
4325+
- {key: TOPOLOGY, value: replica_set}
4326+
- func: install dependencies
4327+
- func: bootstrap mongo-orchestration
4328+
- func: bootstrap kms servers
4329+
- func: install mongodb-client-encryption
4330+
vars:
4331+
LIBMONGOCRYPT_VERSION: latest
4332+
- func: run custom csfle tests
43514333
task_groups:
43524334
- name: serverless_task_group
43534335
setup_group_can_fail_task: true
@@ -5118,12 +5100,9 @@ buildvariants:
51185100
display_name: Custom Dependency Version Test
51195101
run_on: rhel80-large
51205102
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
5103+
- run-custom-csfle-tests-5.0
5104+
- run-custom-csfle-tests-rapid
5105+
- run-custom-csfle-tests-latest
51275106
- test-latest-driver-mongodb-client-encryption-6.0.0
51285107
- name: rhel8-test-serverless
51295108
display_name: Serverless Test
@@ -5217,3 +5196,8 @@ buildvariants:
52175196
run_on: rhel80-large
52185197
tasks:
52195198
- test_atlas_task_group_search_indexes
5199+
- name: nightly
5200+
display_name: Nightly Build
5201+
run_on: rhel80-large
5202+
tasks:
5203+
- .nightly

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 54 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -579,33 +579,54 @@ BUILD_VARIANTS.push({
579579
tasks: ['test-atlas-data-lake']
580580
});
581581

582-
const oneOffFuncAsTasks = [];
582+
const NIGHTLY_TASKS = [
583+
{
584+
name: `run-custom-csfle-tests-with-libmongocrypt-latest`,
585+
tags: ['run-custom-dependency-tests', 'nightly'],
586+
commands: [
587+
updateExpansions({
588+
NODE_LTS_VERSION: LOWEST_LTS,
589+
NPM_VERSION: 9,
590+
VERSION: '8.0',
591+
TOPOLOGY: 'replica_set',
592+
}),
593+
{ func: 'install dependencies' },
594+
{ func: 'bootstrap mongo-orchestration' },
595+
{ func: 'bootstrap kms servers' },
596+
{
597+
func: 'install mongodb-client-encryption',
598+
vars: {
599+
'LIBMONGOCRYPT_VERSION': 'latest'
600+
}
601+
},
602+
{ func: 'run custom csfle tests' }
603+
]
604+
}
605+
];
583606

584-
const FLE_PINNED_COMMIT = '974a4614f8c1c3786e5e39fa63568d83f4f69ebd';
607+
const customDependencyTests = [];
585608

586609
for (const version of ['5.0', 'rapid', 'latest']) {
587-
for (const ref of [FLE_PINNED_COMMIT, 'master']) {
588-
oneOffFuncAsTasks.push({
589-
name: `run-custom-csfle-tests-${version}-${ref === 'master' ? ref : 'pinned-commit'}`,
590-
tags: ['run-custom-dependency-tests'],
591-
commands: [
592-
updateExpansions({
593-
NODE_LTS_VERSION: LOWEST_LTS,
594-
NPM_VERSION: 9,
595-
VERSION: version,
596-
TOPOLOGY: 'replica_set',
597-
CSFLE_GIT_REF: ref
598-
}),
599-
{ func: 'install dependencies' },
600-
{ func: 'bootstrap mongo-orchestration' },
601-
{ func: 'bootstrap kms servers' },
602-
{ func: 'run custom csfle tests' }
603-
]
604-
});
605-
}
610+
customDependencyTests.push({
611+
name: `run-custom-csfle-tests-${version}`,
612+
tags: ['run-custom-dependency-tests'],
613+
commands: [
614+
updateExpansions({
615+
NODE_LTS_VERSION: LOWEST_LTS,
616+
NPM_VERSION: 9,
617+
VERSION: version,
618+
TOPOLOGY: 'replica_set',
619+
}),
620+
{ func: 'install dependencies' },
621+
{ func: 'bootstrap mongo-orchestration' },
622+
{ func: 'bootstrap kms servers' },
623+
{ func: 'install mongodb-client-encryption' },
624+
{ func: 'run custom csfle tests' }
625+
]
626+
});
606627
}
607628

608-
oneOffFuncAsTasks.push({
629+
customDependencyTests.push({
609630
name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
610631
tags: ['run-custom-dependency-tests'],
611632
commands: [
@@ -641,13 +662,13 @@ const coverageTask = {
641662
};
642663

643664
SINGLETON_TASKS.push(coverageTask);
644-
SINGLETON_TASKS.push(...oneOffFuncAsTasks);
665+
SINGLETON_TASKS.push(...customDependencyTests);
645666

646667
BUILD_VARIANTS.push({
647668
name: 'rhel8-custom-dependency-tests',
648669
display_name: 'Custom Dependency Version Test',
649670
run_on: DEFAULT_OS,
650-
tasks: oneOffFuncAsTasks.map(({ name }) => name)
671+
tasks: customDependencyTests.map(({ name }) => name)
651672
});
652673

653674
// special case for serverless testing
@@ -735,6 +756,13 @@ BUILD_VARIANTS.push({
735756
tasks: ['test_atlas_task_group_search_indexes']
736757
});
737758

759+
BUILD_VARIANTS.push({
760+
name: 'nightly',
761+
display_name: 'Nightly Build',
762+
run_on: DEFAULT_OS,
763+
tasks: ['.nightly']
764+
})
765+
738766
// TODO(NODE-4575): unskip zstd and snappy on node 16
739767
for (const variant of BUILD_VARIANTS.filter(
740768
variant => variant.expansions && [16, 18, 20].includes(variant.expansions.NODE_LTS_VERSION)
@@ -758,7 +786,8 @@ fileData.tasks = (fileData.tasks || [])
758786
.concat(SINGLETON_TASKS)
759787
.concat(AUTH_DISABLED_TASKS)
760788
.concat(AWS_LAMBDA_HANDLER_TASKS)
761-
.concat(MONGOCRYPTD_CSFLE_TASKS);
789+
.concat(MONGOCRYPTD_CSFLE_TASKS)
790+
.concat(NIGHTLY_TASKS);
762791

763792
fileData.buildvariants = (fileData.buildvariants || []).concat(BUILD_VARIANTS);
764793

0 commit comments

Comments
 (0)