Skip to content

Commit f89e4c1

Browse files
emadumemadum
authored
fix: dont parse tls/ssl file paths in uri (#2718)
NODE-2977
1 parent b657c8c commit f89e4c1

File tree

6 files changed

+177
-53
lines changed

6 files changed

+177
-53
lines changed

‎.evergreen/config.yml‎

Lines changed: 121 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
stepback: true
22
command_type: system
3-
exec_timeout_secs: 900
3+
exec_timeout_secs: 1200
44
timeout:
55
- command: shell.exec
66
params:
@@ -1129,15 +1129,26 @@ tasks:
11291129
commands:
11301130
- func: install dependencies
11311131
- func: run ldap tests
1132-
- name: test-tls-support
1132+
- name: test-tls-support-latest
11331133
tags:
11341134
- tls-support
11351135
commands:
11361136
- func: install dependencies
11371137
- func: bootstrap mongo-orchestration
11381138
vars:
1139-
SSL: ssl
11401139
VERSION: latest
1140+
SSL: ssl
1141+
TOPOLOGY: server
1142+
- func: run tls tests
1143+
- name: test-tls-support-4.2
1144+
tags:
1145+
- tls-support
1146+
commands:
1147+
- func: install dependencies
1148+
- func: bootstrap mongo-orchestration
1149+
vars:
1150+
VERSION: '4.2'
1151+
SSL: ssl
11411152
TOPOLOGY: server
11421153
- func: run tls tests
11431154
- name: test-latest-ocsp-valid-cert-server-staples
@@ -1437,7 +1448,8 @@ buildvariants:
14371448
- test-auth-kerberos-legacy
14381449
- test-auth-kerberos-unified
14391450
- test-auth-ldap
1440-
- test-tls-support
1451+
- test-tls-support-latest
1452+
- test-tls-support-4.2
14411453
- test-latest-ocsp-valid-cert-server-staples
14421454
- test-latest-ocsp-invalid-cert-server-staples
14431455
- test-latest-ocsp-valid-cert-server-does-not-staple
@@ -1481,37 +1493,111 @@ buildvariants:
14811493
run_on: rhel70-small
14821494
expansions:
14831495
NODE_LTS_NAME: erbium
1484-
tasks: *ref_0
1496+
tasks: &ref_1
1497+
- test-latest-server
1498+
- test-latest-replica_set
1499+
- test-latest-sharded_cluster
1500+
- test-latest-server-unified
1501+
- test-latest-replica_set-unified
1502+
- test-latest-sharded_cluster-unified
1503+
- test-4.4-server
1504+
- test-4.4-replica_set
1505+
- test-4.4-sharded_cluster
1506+
- test-4.4-server-unified
1507+
- test-4.4-replica_set-unified
1508+
- test-4.4-sharded_cluster-unified
1509+
- test-4.2-server
1510+
- test-4.2-replica_set
1511+
- test-4.2-sharded_cluster
1512+
- test-4.2-server-unified
1513+
- test-4.2-replica_set-unified
1514+
- test-4.2-sharded_cluster-unified
1515+
- test-4.0-server
1516+
- test-4.0-replica_set
1517+
- test-4.0-sharded_cluster
1518+
- test-4.0-server-unified
1519+
- test-4.0-replica_set-unified
1520+
- test-4.0-sharded_cluster-unified
1521+
- test-3.6-server
1522+
- test-3.6-replica_set
1523+
- test-3.6-sharded_cluster
1524+
- test-3.6-server-unified
1525+
- test-3.6-replica_set-unified
1526+
- test-3.6-sharded_cluster-unified
1527+
- test-3.4-server
1528+
- test-3.4-replica_set
1529+
- test-3.4-sharded_cluster
1530+
- test-3.4-server-unified
1531+
- test-3.4-replica_set-unified
1532+
- test-3.4-sharded_cluster-unified
1533+
- test-3.2-server
1534+
- test-3.2-replica_set
1535+
- test-3.2-sharded_cluster
1536+
- test-3.2-server-unified
1537+
- test-3.2-replica_set-unified
1538+
- test-3.2-sharded_cluster-unified
1539+
- test-3.0-server
1540+
- test-3.0-replica_set
1541+
- test-3.0-sharded_cluster
1542+
- test-3.0-server-unified
1543+
- test-3.0-replica_set-unified
1544+
- test-3.0-sharded_cluster-unified
1545+
- test-2.6-server
1546+
- test-2.6-replica_set
1547+
- test-2.6-sharded_cluster
1548+
- test-2.6-server-unified
1549+
- test-2.6-replica_set-unified
1550+
- test-2.6-sharded_cluster-unified
1551+
- test-atlas-connectivity
1552+
- test-auth-kerberos-legacy
1553+
- test-auth-kerberos-unified
1554+
- test-auth-ldap
1555+
- test-tls-support-latest
1556+
- test-tls-support-4.2
1557+
- test-latest-ocsp-valid-cert-server-staples
1558+
- test-latest-ocsp-invalid-cert-server-staples
1559+
- test-latest-ocsp-valid-cert-server-does-not-staple
1560+
- test-latest-ocsp-invalid-cert-server-does-not-staple
1561+
- test-latest-ocsp-soft-fail
1562+
- test-latest-ocsp-malicious-invalid-cert-mustStaple-server-does-not-staple
1563+
- test-latest-ocsp-malicious-no-responder-mustStaple-server-does-not-staple
1564+
- test-4.4-ocsp-valid-cert-server-staples
1565+
- test-4.4-ocsp-invalid-cert-server-staples
1566+
- test-4.4-ocsp-valid-cert-server-does-not-staple
1567+
- test-4.4-ocsp-invalid-cert-server-does-not-staple
1568+
- test-4.4-ocsp-soft-fail
1569+
- test-4.4-ocsp-malicious-invalid-cert-mustStaple-server-does-not-staple
1570+
- test-4.4-ocsp-malicious-no-responder-mustStaple-server-does-not-staple
14851571
- name: rhel70-dubnium
14861572
display_name: RHEL 7.0 Node Dubnium
14871573
run_on: rhel70-small
14881574
expansions:
14891575
NODE_LTS_NAME: dubnium
1490-
tasks: *ref_0
1576+
tasks: *ref_1
14911577
- name: rhel70-carbon
14921578
display_name: RHEL 7.0 Node Carbon
14931579
run_on: rhel70-small
14941580
expansions:
14951581
NODE_LTS_NAME: carbon
1496-
tasks: *ref_0
1582+
tasks: *ref_1
14971583
- name: rhel70-boron
14981584
display_name: RHEL 7.0 Node Boron
14991585
run_on: rhel70-small
15001586
expansions:
15011587
NODE_LTS_NAME: boron
1502-
tasks: *ref_0
1588+
tasks: *ref_1
15031589
- name: rhel70-argon
15041590
display_name: RHEL 7.0 Node Argon
15051591
run_on: rhel70-small
15061592
expansions:
15071593
NODE_LTS_NAME: argon
1508-
tasks: *ref_0
1594+
tasks: *ref_1
15091595
- name: ubuntu-14.04-erbium
15101596
display_name: Ubuntu 14.04 Node Erbium
15111597
run_on: ubuntu1404-test
15121598
expansions:
15131599
NODE_LTS_NAME: erbium
1514-
tasks: &ref_1
1600+
tasks: &ref_2
15151601
- test-4.0-server
15161602
- test-4.0-replica_set
15171603
- test-4.0-sharded_cluster
@@ -1557,32 +1643,32 @@ buildvariants:
15571643
run_on: ubuntu1404-test
15581644
expansions:
15591645
NODE_LTS_NAME: dubnium
1560-
tasks: *ref_1
1646+
tasks: *ref_2
15611647
- name: ubuntu-14.04-carbon
15621648
display_name: Ubuntu 14.04 Node Carbon
15631649
run_on: ubuntu1404-test
15641650
expansions:
15651651
NODE_LTS_NAME: carbon
1566-
tasks: *ref_1
1652+
tasks: *ref_2
15671653
- name: ubuntu-14.04-boron
15681654
display_name: Ubuntu 14.04 Node Boron
15691655
run_on: ubuntu1404-test
15701656
expansions:
15711657
NODE_LTS_NAME: boron
1572-
tasks: *ref_1
1658+
tasks: *ref_2
15731659
- name: ubuntu-14.04-argon
15741660
display_name: Ubuntu 14.04 Node Argon
15751661
run_on: ubuntu1404-test
15761662
expansions:
15771663
NODE_LTS_NAME: argon
1578-
tasks: *ref_1
1664+
tasks: *ref_2
15791665
- name: ubuntu-18.04-erbium
15801666
display_name: Ubuntu 18.04 Node Erbium
15811667
run_on: ubuntu1804-test
15821668
expansions:
15831669
NODE_LTS_NAME: erbium
15841670
CLIENT_ENCRYPTION: true
1585-
tasks: &ref_2
1671+
tasks: &ref_3
15861672
- test-latest-server
15871673
- test-latest-replica_set
15881674
- test-latest-sharded_cluster
@@ -1629,7 +1715,8 @@ buildvariants:
16291715
- test-auth-kerberos-legacy
16301716
- test-auth-kerberos-unified
16311717
- test-auth-ldap
1632-
- test-tls-support
1718+
- test-tls-support-latest
1719+
- test-tls-support-4.2
16331720
- test-latest-ocsp-valid-cert-server-staples
16341721
- test-latest-ocsp-invalid-cert-server-staples
16351722
- test-latest-ocsp-valid-cert-server-does-not-staple
@@ -1650,35 +1737,35 @@ buildvariants:
16501737
expansions:
16511738
NODE_LTS_NAME: dubnium
16521739
CLIENT_ENCRYPTION: true
1653-
tasks: *ref_2
1740+
tasks: *ref_3
16541741
- name: ubuntu-18.04-carbon
16551742
display_name: Ubuntu 18.04 Node Carbon
16561743
run_on: ubuntu1804-test
16571744
expansions:
16581745
NODE_LTS_NAME: carbon
16591746
CLIENT_ENCRYPTION: true
1660-
tasks: *ref_2
1747+
tasks: *ref_3
16611748
- name: ubuntu-18.04-boron
16621749
display_name: Ubuntu 18.04 Node Boron
16631750
run_on: ubuntu1804-test
16641751
expansions:
16651752
NODE_LTS_NAME: boron
16661753
CLIENT_ENCRYPTION: true
1667-
tasks: *ref_2
1754+
tasks: *ref_3
16681755
- name: ubuntu-18.04-argon
16691756
display_name: Ubuntu 18.04 Node Argon
16701757
run_on: ubuntu1804-test
16711758
expansions:
16721759
NODE_LTS_NAME: argon
16731760
CLIENT_ENCRYPTION: true
1674-
tasks: *ref_2
1761+
tasks: *ref_3
16751762
- name: windows-64-vs2013-carbon
16761763
display_name: Windows (VS2013) Node Carbon
16771764
run_on: windows-64-vs2013-large
16781765
expansions:
16791766
NODE_LTS_NAME: carbon
16801767
MSVS_VERSION: 2013
1681-
tasks: &ref_3
1768+
tasks: &ref_4
16821769
- test-4.2-server
16831770
- test-4.2-replica_set
16841771
- test-4.2-sharded_cluster
@@ -1721,90 +1808,91 @@ buildvariants:
17211808
- test-2.6-server-unified
17221809
- test-2.6-replica_set-unified
17231810
- test-2.6-sharded_cluster-unified
1811+
- test-tls-support-4.2
17241812
- name: windows-64-vs2013-boron
17251813
display_name: Windows (VS2013) Node Boron
17261814
run_on: windows-64-vs2013-large
17271815
expansions:
17281816
NODE_LTS_NAME: boron
17291817
MSVS_VERSION: 2013
1730-
tasks: *ref_3
1818+
tasks: *ref_4
17311819
- name: windows-64-vs2013-argon
17321820
display_name: Windows (VS2013) Node Argon
17331821
run_on: windows-64-vs2013-large
17341822
expansions:
17351823
NODE_LTS_NAME: argon
17361824
MSVS_VERSION: 2013
1737-
tasks: *ref_3
1825+
tasks: *ref_4
17381826
- name: windows-64-vs2015-erbium
17391827
display_name: Windows (VS2015) Node Erbium
17401828
run_on: windows-64-vs2015-large
17411829
expansions:
17421830
NODE_LTS_NAME: erbium
17431831
MSVS_VERSION: 2015
1744-
tasks: *ref_3
1832+
tasks: *ref_4
17451833
- name: windows-64-vs2015-dubnium
17461834
display_name: Windows (VS2015) Node Dubnium
17471835
run_on: windows-64-vs2015-large
17481836
expansions:
17491837
NODE_LTS_NAME: dubnium
17501838
MSVS_VERSION: 2015
1751-
tasks: *ref_3
1839+
tasks: *ref_4
17521840
- name: windows-64-vs2015-carbon
17531841
display_name: Windows (VS2015) Node Carbon
17541842
run_on: windows-64-vs2015-large
17551843
expansions:
17561844
NODE_LTS_NAME: carbon
17571845
MSVS_VERSION: 2015
1758-
tasks: *ref_3
1846+
tasks: *ref_4
17591847
- name: windows-64-vs2015-boron
17601848
display_name: Windows (VS2015) Node Boron
17611849
run_on: windows-64-vs2015-large
17621850
expansions:
17631851
NODE_LTS_NAME: boron
17641852
MSVS_VERSION: 2015
1765-
tasks: *ref_3
1853+
tasks: *ref_4
17661854
- name: windows-64-vs2015-argon
17671855
display_name: Windows (VS2015) Node Argon
17681856
run_on: windows-64-vs2015-large
17691857
expansions:
17701858
NODE_LTS_NAME: argon
17711859
MSVS_VERSION: 2015
1772-
tasks: *ref_3
1860+
tasks: *ref_4
17731861
- name: windows-64-vs2017-erbium
17741862
display_name: Windows (VS2017) Node Erbium
17751863
run_on: windows-64-vs2017-large
17761864
expansions:
17771865
NODE_LTS_NAME: erbium
17781866
MSVS_VERSION: 2017
1779-
tasks: *ref_3
1867+
tasks: *ref_4
17801868
- name: windows-64-vs2017-dubnium
17811869
display_name: Windows (VS2017) Node Dubnium
17821870
run_on: windows-64-vs2017-large
17831871
expansions:
17841872
NODE_LTS_NAME: dubnium
17851873
MSVS_VERSION: 2017
1786-
tasks: *ref_3
1874+
tasks: *ref_4
17871875
- name: windows-64-vs2017-carbon
17881876
display_name: Windows (VS2017) Node Carbon
17891877
run_on: windows-64-vs2017-large
17901878
expansions:
17911879
NODE_LTS_NAME: carbon
17921880
MSVS_VERSION: 2017
1793-
tasks: *ref_3
1881+
tasks: *ref_4
17941882
- name: windows-64-vs2017-boron
17951883
display_name: Windows (VS2017) Node Boron
17961884
run_on: windows-64-vs2017-large
17971885
expansions:
17981886
NODE_LTS_NAME: boron
17991887
MSVS_VERSION: 2017
1800-
tasks: *ref_3
1888+
tasks: *ref_4
18011889
- name: windows-64-vs2017-argon
18021890
display_name: Windows (VS2017) Node Argon
18031891
run_on: windows-64-vs2017-large
18041892
expansions:
18051893
NODE_LTS_NAME: argon
18061894
MSVS_VERSION: 2017
1807-
tasks: *ref_3
1895+
tasks: *ref_4
18081896
- name: lint
18091897
display_name: lint
18101898
run_on: rhel70

‎.evergreen/config.yml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ command_type: system
1111
# Protect ourself against rogue test case, or curl gone wild, that runs forever
1212
# Good rule of thumb: the averageish length a task takes, times 5
1313
# That roughly accounts for variable system performance for various buildvariants
14-
exec_timeout_secs: 900
14+
exec_timeout_secs: 1200
1515

1616
# What to do when evergreen hits the timeout (`post:` tasks are run automatically)
1717
timeout:

0 commit comments

Comments
 (0)