Skip to content

Commit bff37aa

Browse files
test(NODE-4395): add csfle master && pinned commit tasks to CI (#3334)
1 parent efc3b69 commit bff37aa

File tree

3 files changed

+55
-6
lines changed

3 files changed

+55
-6
lines changed

.evergreen/config.yml

+20-2
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ tasks:
16531653
- func: run bson-ext test
16541654
vars:
16551655
NODE_LTS_NAME: erbium
1656-
- name: run-custom-csfle-tests
1656+
- name: run-custom-csfle-tests-pinned-commit
16571657
tags:
16581658
- run-custom-dependency-tests
16591659
commands:
@@ -1666,6 +1666,23 @@ tasks:
16661666
TOPOLOGY: replica_set
16671667
- func: bootstrap kms servers
16681668
- func: run custom csfle tests
1669+
vars:
1670+
CSFLE_GIT_REF: c2712248e9f4909cdad723607ea5291d2eb48b91
1671+
- name: run-custom-csfle-tests-master
1672+
tags:
1673+
- run-custom-dependency-tests
1674+
commands:
1675+
- func: install dependencies
1676+
vars:
1677+
NODE_LTS_NAME: erbium
1678+
- func: bootstrap mongo-orchestration
1679+
vars:
1680+
VERSION: latest
1681+
TOPOLOGY: replica_set
1682+
- func: bootstrap kms servers
1683+
- func: run custom csfle tests
1684+
vars:
1685+
CSFLE_GIT_REF: master
16691686
- name: test-latest-server-noauth
16701687
tags:
16711688
- latest
@@ -2226,7 +2243,8 @@ buildvariants:
22262243
tasks:
22272244
- run-custom-snappy-tests
22282245
- run-bson-ext-test
2229-
- run-custom-csfle-tests
2246+
- run-custom-csfle-tests-pinned-commit
2247+
- run-custom-csfle-tests-master
22302248
- name: ubuntu1804-test-serverless
22312249
display_name: Serverless Test
22322250
run_on: ubuntu1804-test

.evergreen/generate_evergreen_tasks.js

+34-2
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
537537
}));
538538

539539
oneOffFuncAsTasks.push({
540-
name: 'run-custom-csfle-tests',
540+
name: 'run-custom-csfle-tests-pinned-commit',
541541
tags: ['run-custom-dependency-tests'],
542542
commands: [
543543
{
@@ -554,7 +554,39 @@ oneOffFuncAsTasks.push({
554554
}
555555
},
556556
{ func: 'bootstrap kms servers' },
557-
{ func: 'run custom csfle tests' }
557+
{
558+
func: 'run custom csfle tests',
559+
vars: {
560+
CSFLE_GIT_REF: 'c2712248e9f4909cdad723607ea5291d2eb48b91'
561+
}
562+
}
563+
]
564+
});
565+
566+
oneOffFuncAsTasks.push({
567+
name: 'run-custom-csfle-tests-master',
568+
tags: ['run-custom-dependency-tests'],
569+
commands: [
570+
{
571+
func: 'install dependencies',
572+
vars: {
573+
NODE_LTS_NAME: LOWEST_LTS
574+
}
575+
},
576+
{
577+
func: 'bootstrap mongo-orchestration',
578+
vars: {
579+
VERSION: 'latest',
580+
TOPOLOGY: 'replica_set'
581+
}
582+
},
583+
{ func: 'bootstrap kms servers' },
584+
{
585+
func: 'run custom csfle tests',
586+
vars: {
587+
CSFLE_GIT_REF: 'master'
588+
}
589+
}
558590
]
559591
});
560592

.evergreen/run-custom-csfle-tests.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ ABS_PATH_TO_PATCH=$(pwd)
2626
# Environment Variables:
2727
# CSFLE_GIT_REF - set the git reference to checkout for a custom CSFLE version
2828
# CDRIVER_GIT_REF - set the git reference to checkout for a custom CDRIVER version (this is for libbson)
29-
30-
CSFLE_GIT_REF=${CSFLE_GIT_REF:-c2712248e9f4909cdad723607ea5291d2eb48b91}
29+
CSFLE_GIT_REF=${CSFLE_GIT_REF:-master}
3130
CDRIVER_GIT_REF=${CDRIVER_GIT_REF:-1.17.6}
3231

3332
rm -rf ../csfle-deps-tmp

0 commit comments

Comments
 (0)