@@ -51,6 +51,8 @@ functions:
51
51
export MONGODB_BINARIES="$MONGODB_BINARIES"
52
52
export UPLOAD_BUCKET="$UPLOAD_BUCKET"
53
53
export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
54
+ export CSFLE_GIT_REF="$CSFLE_GIT_REF"
55
+ export CDRIVER_GIT_REF="$CDRIVER_GIT_REF"
54
56
55
57
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
56
58
export PATH="$MONGODB_BINARIES:$PATH"
@@ -436,6 +438,36 @@ functions:
436
438
-p 8100 \
437
439
-v \
438
440
--fault revoked
441
+ run custom csfle tests :
442
+ - command : shell.exec
443
+ type : test
444
+ params :
445
+ silent : true
446
+ working_dir : src
447
+ script : |
448
+ ${PREPARE_SHELL}
449
+ cat <<EOT > prepare_client_encryption.sh
450
+ export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
451
+ export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
452
+ export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}"
453
+ export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}"
454
+ export CSFLE_GIT_REF="${CSFLE_GIT_REF}"
455
+ export CDRIVER_GIT_REF="${CDRIVER_GIT_REF}"
456
+ EOT
457
+ - command : shell.exec
458
+ type : test
459
+ params :
460
+ working_dir : src
461
+ timeout_secs : 60
462
+ script : |
463
+ ${PREPARE_SHELL}
464
+
465
+ # Disable xtrace (just in case it was accidentally set).
466
+ set +x
467
+ . ./prepare_client_encryption.sh
468
+ rm -f ./prepare_client_encryption.sh
469
+
470
+ UNIFIED=${UNIFIED} MONGODB_URI="${MONGODB_URI}" bash ${PROJECT_DIRECTORY}/.evergreen/run-custom-csfle-tests.sh
439
471
upload test results :
440
472
- command : attach.xunit_results
441
473
params :
@@ -1387,6 +1419,18 @@ tasks:
1387
1419
vars :
1388
1420
NODE_LTS_NAME : erbium
1389
1421
- func : run checks
1422
+ - name : run-custom-csfle-tests
1423
+ tags :
1424
+ - run-custom-csfle-tests
1425
+ commands :
1426
+ - func : install dependencies
1427
+ vars :
1428
+ NODE_LTS_NAME : erbium
1429
+ - func : bootstrap mongo-orchestration
1430
+ vars :
1431
+ VERSION : ' 4.4'
1432
+ TOPOLOGY : server
1433
+ - func : run custom csfle tests
1390
1434
buildvariants :
1391
1435
- name : macos-1014-erbium
1392
1436
display_name : macOS 10.14 Node Erbium
@@ -1468,12 +1512,6 @@ buildvariants:
1468
1512
- test-4.4-ocsp-soft-fail
1469
1513
- test-4.4-ocsp-malicious-invalid-cert-mustStaple-server-does-not-staple
1470
1514
- test-4.4-ocsp-malicious-no-responder-mustStaple-server-does-not-staple
1471
- - name : macos-1014-fermium
1472
- display_name : macOS 10.14 Node Fermium
1473
- run_on : macos-1014
1474
- expansions :
1475
- NODE_LTS_NAME : fermium
1476
- tasks : *ref_0
1477
1515
- name : macos-1014-dubnium
1478
1516
display_name : macOS 10.14 Node Dubnium
1479
1517
run_on : macos-1014
@@ -1578,12 +1616,6 @@ buildvariants:
1578
1616
- test-4.4-ocsp-soft-fail
1579
1617
- test-4.4-ocsp-malicious-invalid-cert-mustStaple-server-does-not-staple
1580
1618
- test-4.4-ocsp-malicious-no-responder-mustStaple-server-does-not-staple
1581
- - name : rhel70-fermium
1582
- display_name : RHEL 7.0 Node Fermium
1583
- run_on : rhel70-small
1584
- expansions :
1585
- NODE_LTS_NAME : fermium
1586
- tasks : *ref_1
1587
1619
- name : rhel70-dubnium
1588
1620
display_name : RHEL 7.0 Node Dubnium
1589
1621
run_on : rhel70-small
@@ -1654,12 +1686,6 @@ buildvariants:
1654
1686
- test-auth-kerberos-legacy
1655
1687
- test-auth-kerberos-unified
1656
1688
- test-auth-ldap
1657
- - name : ubuntu-14.04-fermium
1658
- display_name : Ubuntu 14.04 Node Fermium
1659
- run_on : ubuntu1404-test
1660
- expansions :
1661
- NODE_LTS_NAME : fermium
1662
- tasks : *ref_2
1663
1689
- name : ubuntu-14.04-dubnium
1664
1690
display_name : Ubuntu 14.04 Node Dubnium
1665
1691
run_on : ubuntu1404-test
@@ -1753,13 +1779,6 @@ buildvariants:
1753
1779
- test-4.4-ocsp-soft-fail
1754
1780
- test-4.4-ocsp-malicious-invalid-cert-mustStaple-server-does-not-staple
1755
1781
- test-4.4-ocsp-malicious-no-responder-mustStaple-server-does-not-staple
1756
- - name : ubuntu-18.04-fermium
1757
- display_name : Ubuntu 18.04 Node Fermium
1758
- run_on : ubuntu1804-test
1759
- expansions :
1760
- NODE_LTS_NAME : fermium
1761
- CLIENT_ENCRYPTION : true
1762
- tasks : *ref_3
1763
1782
- name : ubuntu-18.04-dubnium
1764
1783
display_name : Ubuntu 18.04 Node Dubnium
1765
1784
run_on : ubuntu1804-test
@@ -1852,13 +1871,6 @@ buildvariants:
1852
1871
NODE_LTS_NAME : argon
1853
1872
MSVS_VERSION : 2013
1854
1873
tasks : *ref_4
1855
- - name : windows-64-vs2015-fermium
1856
- display_name : Windows (VS2015) Node Fermium
1857
- run_on : windows-64-vs2015-large
1858
- expansions :
1859
- NODE_LTS_NAME : fermium
1860
- MSVS_VERSION : 2015
1861
- tasks : *ref_4
1862
1874
- name : windows-64-vs2015-erbium
1863
1875
display_name : Windows (VS2015) Node Erbium
1864
1876
run_on : windows-64-vs2015-large
@@ -1894,13 +1906,6 @@ buildvariants:
1894
1906
NODE_LTS_NAME : argon
1895
1907
MSVS_VERSION : 2015
1896
1908
tasks : *ref_4
1897
- - name : windows-64-vs2017-fermium
1898
- display_name : Windows (VS2017) Node Fermium
1899
- run_on : windows-64-vs2017-large
1900
- expansions :
1901
- NODE_LTS_NAME : fermium
1902
- MSVS_VERSION : 2017
1903
- tasks : *ref_4
1904
1909
- name : windows-64-vs2017-erbium
1905
1910
display_name : Windows (VS2017) Node Erbium
1906
1911
run_on : windows-64-vs2017-large
@@ -1941,6 +1946,11 @@ buildvariants:
1941
1946
run_on : rhel70
1942
1947
tasks :
1943
1948
- run-checks
1949
+ - name : ubuntu1804-custom-csfle-tests
1950
+ display_name : Custom FLE Version Test
1951
+ run_on : ubuntu1804-test
1952
+ tasks :
1953
+ - run-custom-csfle-tests
1944
1954
- name : ubuntu1804-test-mongodb-aws
1945
1955
display_name : MONGODB-AWS Auth test
1946
1956
run_on : ubuntu1804-test
0 commit comments