Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dont parse tls/ssl file paths in uri #2718

Merged
merged 3 commits into from Jan 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
154 changes: 121 additions & 33 deletions .evergreen/config.yml
@@ -1,6 +1,6 @@
stepback: true
command_type: system
exec_timeout_secs: 900
exec_timeout_secs: 1200
timeout:
- command: shell.exec
params:
Expand Down Expand Up @@ -1129,15 +1129,26 @@ tasks:
commands:
- func: install dependencies
- func: run ldap tests
- name: test-tls-support
- name: test-tls-support-latest
tags:
- tls-support
commands:
- func: install dependencies
- func: bootstrap mongo-orchestration
vars:
SSL: ssl
VERSION: latest
SSL: ssl
TOPOLOGY: server
- func: run tls tests
- name: test-tls-support-4.2
tags:
- tls-support
commands:
- func: install dependencies
- func: bootstrap mongo-orchestration
vars:
VERSION: '4.2'
SSL: ssl
TOPOLOGY: server
- func: run tls tests
- name: test-latest-ocsp-valid-cert-server-staples
Expand Down Expand Up @@ -1437,7 +1448,8 @@ buildvariants:
- test-auth-kerberos-legacy
- test-auth-kerberos-unified
- test-auth-ldap
- test-tls-support
- test-tls-support-latest
- test-tls-support-4.2
- test-latest-ocsp-valid-cert-server-staples
- test-latest-ocsp-invalid-cert-server-staples
- test-latest-ocsp-valid-cert-server-does-not-staple
Expand Down Expand Up @@ -1481,37 +1493,111 @@ buildvariants:
run_on: rhel70-small
expansions:
NODE_LTS_NAME: erbium
tasks: *ref_0
tasks: &ref_1
- test-latest-server
- test-latest-replica_set
- test-latest-sharded_cluster
- test-latest-server-unified
- test-latest-replica_set-unified
- test-latest-sharded_cluster-unified
- test-4.4-server
- test-4.4-replica_set
- test-4.4-sharded_cluster
- test-4.4-server-unified
- test-4.4-replica_set-unified
- test-4.4-sharded_cluster-unified
- test-4.2-server
- test-4.2-replica_set
- test-4.2-sharded_cluster
- test-4.2-server-unified
- test-4.2-replica_set-unified
- test-4.2-sharded_cluster-unified
- test-4.0-server
- test-4.0-replica_set
- test-4.0-sharded_cluster
- test-4.0-server-unified
- test-4.0-replica_set-unified
- test-4.0-sharded_cluster-unified
- test-3.6-server
- test-3.6-replica_set
- test-3.6-sharded_cluster
- test-3.6-server-unified
- test-3.6-replica_set-unified
- test-3.6-sharded_cluster-unified
- test-3.4-server
- test-3.4-replica_set
- test-3.4-sharded_cluster
- test-3.4-server-unified
- test-3.4-replica_set-unified
- test-3.4-sharded_cluster-unified
- test-3.2-server
- test-3.2-replica_set
- test-3.2-sharded_cluster
- test-3.2-server-unified
- test-3.2-replica_set-unified
- test-3.2-sharded_cluster-unified
- test-3.0-server
- test-3.0-replica_set
- test-3.0-sharded_cluster
- test-3.0-server-unified
- test-3.0-replica_set-unified
- test-3.0-sharded_cluster-unified
- test-2.6-server
- test-2.6-replica_set
- test-2.6-sharded_cluster
- test-2.6-server-unified
- test-2.6-replica_set-unified
- test-2.6-sharded_cluster-unified
- test-atlas-connectivity
- test-auth-kerberos-legacy
- test-auth-kerberos-unified
- test-auth-ldap
- test-tls-support-latest
- test-tls-support-4.2
- test-latest-ocsp-valid-cert-server-staples
- test-latest-ocsp-invalid-cert-server-staples
- test-latest-ocsp-valid-cert-server-does-not-staple
- test-latest-ocsp-invalid-cert-server-does-not-staple
- test-latest-ocsp-soft-fail
- test-latest-ocsp-malicious-invalid-cert-mustStaple-server-does-not-staple
- test-latest-ocsp-malicious-no-responder-mustStaple-server-does-not-staple
- test-4.4-ocsp-valid-cert-server-staples
- test-4.4-ocsp-invalid-cert-server-staples
- test-4.4-ocsp-valid-cert-server-does-not-staple
- test-4.4-ocsp-invalid-cert-server-does-not-staple
- test-4.4-ocsp-soft-fail
- test-4.4-ocsp-malicious-invalid-cert-mustStaple-server-does-not-staple
- test-4.4-ocsp-malicious-no-responder-mustStaple-server-does-not-staple
- name: rhel70-dubnium
display_name: RHEL 7.0 Node Dubnium
run_on: rhel70-small
expansions:
NODE_LTS_NAME: dubnium
tasks: *ref_0
tasks: *ref_1
- name: rhel70-carbon
display_name: RHEL 7.0 Node Carbon
run_on: rhel70-small
expansions:
NODE_LTS_NAME: carbon
tasks: *ref_0
tasks: *ref_1
- name: rhel70-boron
display_name: RHEL 7.0 Node Boron
run_on: rhel70-small
expansions:
NODE_LTS_NAME: boron
tasks: *ref_0
tasks: *ref_1
- name: rhel70-argon
display_name: RHEL 7.0 Node Argon
run_on: rhel70-small
expansions:
NODE_LTS_NAME: argon
tasks: *ref_0
tasks: *ref_1
- name: ubuntu-14.04-erbium
display_name: Ubuntu 14.04 Node Erbium
run_on: ubuntu1404-test
expansions:
NODE_LTS_NAME: erbium
tasks: &ref_1
tasks: &ref_2
- test-4.0-server
- test-4.0-replica_set
- test-4.0-sharded_cluster
Expand Down Expand Up @@ -1557,32 +1643,32 @@ buildvariants:
run_on: ubuntu1404-test
expansions:
NODE_LTS_NAME: dubnium
tasks: *ref_1
tasks: *ref_2
- name: ubuntu-14.04-carbon
display_name: Ubuntu 14.04 Node Carbon
run_on: ubuntu1404-test
expansions:
NODE_LTS_NAME: carbon
tasks: *ref_1
tasks: *ref_2
- name: ubuntu-14.04-boron
display_name: Ubuntu 14.04 Node Boron
run_on: ubuntu1404-test
expansions:
NODE_LTS_NAME: boron
tasks: *ref_1
tasks: *ref_2
- name: ubuntu-14.04-argon
display_name: Ubuntu 14.04 Node Argon
run_on: ubuntu1404-test
expansions:
NODE_LTS_NAME: argon
tasks: *ref_1
tasks: *ref_2
- name: ubuntu-18.04-erbium
display_name: Ubuntu 18.04 Node Erbium
run_on: ubuntu1804-test
expansions:
NODE_LTS_NAME: erbium
CLIENT_ENCRYPTION: true
tasks: &ref_2
tasks: &ref_3
- test-latest-server
- test-latest-replica_set
- test-latest-sharded_cluster
Expand Down Expand Up @@ -1629,7 +1715,8 @@ buildvariants:
- test-auth-kerberos-legacy
- test-auth-kerberos-unified
- test-auth-ldap
- test-tls-support
- test-tls-support-latest
- test-tls-support-4.2
- test-latest-ocsp-valid-cert-server-staples
- test-latest-ocsp-invalid-cert-server-staples
- test-latest-ocsp-valid-cert-server-does-not-staple
Expand All @@ -1650,35 +1737,35 @@ buildvariants:
expansions:
NODE_LTS_NAME: dubnium
CLIENT_ENCRYPTION: true
tasks: *ref_2
tasks: *ref_3
- name: ubuntu-18.04-carbon
display_name: Ubuntu 18.04 Node Carbon
run_on: ubuntu1804-test
expansions:
NODE_LTS_NAME: carbon
CLIENT_ENCRYPTION: true
tasks: *ref_2
tasks: *ref_3
- name: ubuntu-18.04-boron
display_name: Ubuntu 18.04 Node Boron
run_on: ubuntu1804-test
expansions:
NODE_LTS_NAME: boron
CLIENT_ENCRYPTION: true
tasks: *ref_2
tasks: *ref_3
- name: ubuntu-18.04-argon
display_name: Ubuntu 18.04 Node Argon
run_on: ubuntu1804-test
expansions:
NODE_LTS_NAME: argon
CLIENT_ENCRYPTION: true
tasks: *ref_2
tasks: *ref_3
- name: windows-64-vs2013-carbon
display_name: Windows (VS2013) Node Carbon
run_on: windows-64-vs2013-large
expansions:
NODE_LTS_NAME: carbon
MSVS_VERSION: 2013
tasks: &ref_3
tasks: &ref_4
- test-4.2-server
- test-4.2-replica_set
- test-4.2-sharded_cluster
Expand Down Expand Up @@ -1721,90 +1808,91 @@ buildvariants:
- test-2.6-server-unified
- test-2.6-replica_set-unified
- test-2.6-sharded_cluster-unified
- test-tls-support-4.2
- name: windows-64-vs2013-boron
display_name: Windows (VS2013) Node Boron
run_on: windows-64-vs2013-large
expansions:
NODE_LTS_NAME: boron
MSVS_VERSION: 2013
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2013-argon
display_name: Windows (VS2013) Node Argon
run_on: windows-64-vs2013-large
expansions:
NODE_LTS_NAME: argon
MSVS_VERSION: 2013
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2015-erbium
display_name: Windows (VS2015) Node Erbium
run_on: windows-64-vs2015-large
expansions:
NODE_LTS_NAME: erbium
MSVS_VERSION: 2015
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2015-dubnium
display_name: Windows (VS2015) Node Dubnium
run_on: windows-64-vs2015-large
expansions:
NODE_LTS_NAME: dubnium
MSVS_VERSION: 2015
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2015-carbon
display_name: Windows (VS2015) Node Carbon
run_on: windows-64-vs2015-large
expansions:
NODE_LTS_NAME: carbon
MSVS_VERSION: 2015
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2015-boron
display_name: Windows (VS2015) Node Boron
run_on: windows-64-vs2015-large
expansions:
NODE_LTS_NAME: boron
MSVS_VERSION: 2015
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2015-argon
display_name: Windows (VS2015) Node Argon
run_on: windows-64-vs2015-large
expansions:
NODE_LTS_NAME: argon
MSVS_VERSION: 2015
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2017-erbium
display_name: Windows (VS2017) Node Erbium
run_on: windows-64-vs2017-large
expansions:
NODE_LTS_NAME: erbium
MSVS_VERSION: 2017
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2017-dubnium
display_name: Windows (VS2017) Node Dubnium
run_on: windows-64-vs2017-large
expansions:
NODE_LTS_NAME: dubnium
MSVS_VERSION: 2017
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2017-carbon
display_name: Windows (VS2017) Node Carbon
run_on: windows-64-vs2017-large
expansions:
NODE_LTS_NAME: carbon
MSVS_VERSION: 2017
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2017-boron
display_name: Windows (VS2017) Node Boron
run_on: windows-64-vs2017-large
expansions:
NODE_LTS_NAME: boron
MSVS_VERSION: 2017
tasks: *ref_3
tasks: *ref_4
- name: windows-64-vs2017-argon
display_name: Windows (VS2017) Node Argon
run_on: windows-64-vs2017-large
expansions:
NODE_LTS_NAME: argon
MSVS_VERSION: 2017
tasks: *ref_3
tasks: *ref_4
- name: lint
display_name: lint
run_on: rhel70
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/config.yml.in
Expand Up @@ -11,7 +11,7 @@ command_type: system
# Protect ourself against rogue test case, or curl gone wild, that runs forever
# Good rule of thumb: the averageish length a task takes, times 5
# That roughly accounts for variable system performance for various buildvariants
exec_timeout_secs: 900
exec_timeout_secs: 1200

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