File tree 3 files changed +55
-6
lines changed
3 files changed +55
-6
lines changed Original file line number Diff line number Diff line change @@ -1653,7 +1653,7 @@ tasks:
1653
1653
- func : run bson-ext test
1654
1654
vars :
1655
1655
NODE_LTS_NAME : erbium
1656
- - name : run-custom-csfle-tests
1656
+ - name : run-custom-csfle-tests-pinned-commit
1657
1657
tags :
1658
1658
- run-custom-dependency-tests
1659
1659
commands :
@@ -1666,6 +1666,23 @@ tasks:
1666
1666
TOPOLOGY : replica_set
1667
1667
- func : bootstrap kms servers
1668
1668
- 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
1669
1686
- name : test-latest-server-noauth
1670
1687
tags :
1671
1688
- latest
@@ -2226,7 +2243,8 @@ buildvariants:
2226
2243
tasks :
2227
2244
- run-custom-snappy-tests
2228
2245
- run-bson-ext-test
2229
- - run-custom-csfle-tests
2246
+ - run-custom-csfle-tests-pinned-commit
2247
+ - run-custom-csfle-tests-master
2230
2248
- name : ubuntu1804-test-serverless
2231
2249
display_name : Serverless Test
2232
2250
run_on : ubuntu1804-test
Original file line number Diff line number Diff line change @@ -537,7 +537,7 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
537
537
} ) ) ;
538
538
539
539
oneOffFuncAsTasks . push ( {
540
- name : 'run-custom-csfle-tests' ,
540
+ name : 'run-custom-csfle-tests-pinned-commit ' ,
541
541
tags : [ 'run-custom-dependency-tests' ] ,
542
542
commands : [
543
543
{
@@ -554,7 +554,39 @@ oneOffFuncAsTasks.push({
554
554
}
555
555
} ,
556
556
{ 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
+ }
558
590
]
559
591
} ) ;
560
592
Original file line number Diff line number Diff line change @@ -26,8 +26,7 @@ ABS_PATH_TO_PATCH=$(pwd)
26
26
# Environment Variables:
27
27
# CSFLE_GIT_REF - set the git reference to checkout for a custom CSFLE version
28
28
# 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}
31
30
CDRIVER_GIT_REF=${CDRIVER_GIT_REF:- 1.17.6}
32
31
33
32
rm -rf ../csfle-deps-tmp
You can’t perform that action at this time.
0 commit comments