Skip to content

Commit 2f1c62a

Browse files
committed
test(NODE-3777): split out csfle config
1 parent 0635969 commit 2f1c62a

File tree

2 files changed

+36
-15
lines changed

2 files changed

+36
-15
lines changed

.evergreen/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ tasks:
17531753
vars:
17541754
NODE_LTS_NAME: fermium
17551755
- func: run mongosh integration tests
1756-
- name: run-custom-csfle-tests
1756+
- name: run-custom-snappy-tests
17571757
tags:
17581758
- run-custom-dependency-tests
17591759
commands:
@@ -1764,9 +1764,9 @@ tasks:
17641764
vars:
17651765
VERSION: '5.0'
17661766
TOPOLOGY: server
1767-
- func: bootstrap kms servers
1768-
- func: run custom csfle tests
1769-
- name: run-custom-snappy-tests
1767+
AUTH: auth
1768+
- func: run custom snappy tests
1769+
- name: run-bson-ext-test
17701770
tags:
17711771
- run-custom-dependency-tests
17721772
commands:
@@ -1777,9 +1777,11 @@ tasks:
17771777
vars:
17781778
VERSION: '5.0'
17791779
TOPOLOGY: server
1780-
- func: bootstrap kms servers
1781-
- func: run custom snappy tests
1782-
- name: run-bson-ext-test
1780+
AUTH: auth
1781+
- func: run bson-ext test
1782+
vars:
1783+
NODE_LTS_NAME: erbium
1784+
- name: run-custom-csfle-tests
17831785
tags:
17841786
- run-custom-dependency-tests
17851787
commands:
@@ -1788,12 +1790,10 @@ tasks:
17881790
NODE_LTS_NAME: erbium
17891791
- func: bootstrap mongo-orchestration
17901792
vars:
1791-
VERSION: '5.0'
1793+
VERSION: latest
17921794
TOPOLOGY: server
17931795
- func: bootstrap kms servers
1794-
- func: run bson-ext test
1795-
vars:
1796-
NODE_LTS_NAME: erbium
1796+
- func: run custom csfle tests
17971797
- name: test-latest-server-noauth
17981798
tags:
17991799
- latest
@@ -2343,9 +2343,9 @@ buildvariants:
23432343
display_name: Custom Dependency Version Test
23442344
run_on: ubuntu1804-large
23452345
tasks:
2346-
- run-custom-csfle-tests
23472346
- run-custom-snappy-tests
23482347
- run-bson-ext-test
2348+
- run-custom-csfle-tests
23492349
- name: ubuntu1804-test-serverless
23502350
display_name: Serverless Test
23512351
run_on: ubuntu1804-test

.evergreen/generate_evergreen_tasks.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,6 @@ BUILD_VARIANTS.push({
640640
});
641641

642642
const oneOffFuncs = [
643-
{ func: 'run custom csfle tests' },
644643
{ func: 'run custom snappy tests' },
645644
{
646645
func: 'run bson-ext test',
@@ -664,14 +663,36 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
664663
func: 'bootstrap mongo-orchestration',
665664
vars: {
666665
VERSION: '5.0',
667-
TOPOLOGY: 'server'
666+
TOPOLOGY: 'server',
667+
AUTH: 'auth'
668668
}
669669
},
670-
{ func: 'bootstrap kms servers' },
671670
oneOffFunc
672671
]
673672
}));
674673

674+
oneOffFuncAsTasks.push({
675+
name: 'run-custom-csfle-tests',
676+
tags: ['run-custom-dependency-tests'],
677+
commands: [
678+
{
679+
func: 'install dependencies',
680+
vars: {
681+
NODE_LTS_NAME: LOWEST_LTS
682+
}
683+
},
684+
{
685+
func: 'bootstrap mongo-orchestration',
686+
vars: {
687+
VERSION: 'latest',
688+
TOPOLOGY: 'server'
689+
}
690+
},
691+
{ func: 'bootstrap kms servers' },
692+
{ func: 'run custom csfle tests' }
693+
]
694+
});
695+
675696
// TODO NODE-3897 - generate combined coverage report
676697
const coverageTask = {
677698
name: 'download and merge coverage'.split(' ').join('-'),

0 commit comments

Comments
 (0)