Skip to content

Commit 1ef21b7

Browse files
ShaneHarveyShaneHarvey
committed
PYTHON-1370 Remove redundant auth/ssl testing.
1 parent 57b5a01 commit 1ef21b7

File tree

1 file changed

+56
-50
lines changed

1 file changed

+56
-50
lines changed

‎.evergreen/config.yml‎

Lines changed: 56 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -780,23 +780,6 @@ axes:
780780
run_on: linux-64-amzn-test
781781
batchtime: 10080 # 7 days
782782

783-
# OSes that support versions of MongoDB without SSL.
784-
- id: os-nossl
785-
display_name: OS
786-
values:
787-
- id: archlinux-test
788-
display_name: "Archlinux"
789-
run_on: archlinux-test
790-
batchtime: 10080 # 7 days
791-
792-
- id: macos-1012
793-
display_name: "macOS 10.12"
794-
run_on: macos-1012
795-
796-
# OSes that support versions of MongoDB>=2.6 with SSL.
797-
- id: os-requires-26
798-
display_name: OS
799-
values:
800783
- id: ubuntu-14.04
801784
display_name: "Ubuntu 14.04"
802785
run_on: ubuntu1404-test
@@ -812,6 +795,19 @@ axes:
812795
run_on: debian71-test
813796
batchtime: 10080 # 7 days
814797

798+
# OSes that support versions of MongoDB without SSL.
799+
- id: os-nossl
800+
display_name: OS
801+
values:
802+
- id: archlinux-test
803+
display_name: "Archlinux"
804+
run_on: archlinux-test
805+
batchtime: 10080 # 7 days
806+
807+
- id: macos-1012
808+
display_name: "macOS 10.12"
809+
run_on: macos-1012
810+
815811
# OSes that support versions of MongoDB>=3.2 with SSL.
816812
- id: os-requires-32
817813
display_name: OS
@@ -910,6 +906,19 @@ axes:
910906
display_name: NoSSL
911907
variables:
912908
SSL: "nossl"
909+
- id: auth-ssl
910+
display_name: Auth SSL
911+
values:
912+
- id: auth-ssl
913+
display_name: Auth SSL
914+
variables:
915+
AUTH: "auth"
916+
SSL: "ssl"
917+
- id: noauth-nossl
918+
display_name: NoAuth NoSSL
919+
variables:
920+
AUTH: "noauth"
921+
SSL: "nossl"
913922
- id: python-version
914923
display_name: "Python"
915924
values:
@@ -1038,8 +1047,8 @@ axes:
10381047
buildvariants:
10391048

10401049
- matrix_name: "tests-all"
1041-
matrix_spec: {"os-fully-featured": "*", auth: "*", ssl: "*"}
1042-
display_name: "${os-fully-featured} ${auth} ${ssl}"
1050+
matrix_spec: {"os-fully-featured": "*", auth-ssl: "*"}
1051+
display_name: "${os-fully-featured} ${auth-ssl}"
10431052
tasks:
10441053
- ".latest"
10451054
- ".3.4"
@@ -1057,48 +1066,46 @@ buildvariants:
10571066
- ".3.0"
10581067
- ".2.6"
10591068

1060-
- matrix_name: "tests-os-requires-26"
1061-
matrix_spec: {"os-requires-26": "*", auth: "*", ssl: "*"}
1062-
display_name: "${os-requires-26} ${auth} ${ssl}"
1063-
tasks:
1064-
- ".latest"
1065-
- ".3.4"
1066-
- ".3.2"
1067-
- ".3.0"
1068-
- ".2.6"
1069-
10701069
- matrix_name: "tests-os-requires-32"
1071-
matrix_spec: {"os-requires-32": "*", auth: "*", ssl: "*"}
1072-
display_name: "${os-requires-32} ${auth} ${ssl}"
1070+
matrix_spec: {"os-requires-32": "*", auth-ssl: "*"}
1071+
display_name: "${os-requires-32} ${auth-ssl}"
10731072
tasks:
10741073
- ".latest"
10751074
- ".3.4"
10761075
- ".3.2"
10771076

10781077
- matrix_name: "tests-ssl-requires-32"
1079-
matrix_spec: {"os-ssl-requires-32": "*", auth: "*", ssl: "ssl"}
1078+
matrix_spec: {"os-ssl-requires-32": "*", auth: "auth", ssl: "ssl"}
10801079
display_name: "${os-ssl-requires-32} ${auth} ${ssl}"
10811080
tasks:
10821081
- ".latest"
10831082
- ".3.4"
10841083
- ".3.2"
10851084

10861085
- matrix_name: "tests-os-requires-34"
1087-
matrix_spec: {"os-requires-34": "*", auth: "*", ssl: "*"}
1088-
display_name: "${os-requires-34} ${auth} ${ssl}"
1086+
matrix_spec: {"os-requires-34": "*", auth-ssl: "*"}
1087+
display_name: "${os-requires-34} ${auth-ssl}"
10891088
tasks:
10901089
- ".latest"
10911090
- ".3.4"
10921091

10931092
- matrix_name: "tests-python-version-ubuntu1204-test-ssl"
10941093
matrix_spec: {"python-version": "*", auth: "*", ssl: "*", coverage: "*"}
10951094
exclude_spec:
1096-
# PYTHON-498: disable Jython SSL tests
1097-
python-version: "jython2.7"
1098-
# EVG-1410: exlcude_spec must specifiy values for all axes
1099-
auth: "*"
1100-
ssl: "ssl"
1101-
coverage: "*"
1095+
- python-version: "*"
1096+
auth: "noauth"
1097+
ssl: "ssl"
1098+
coverage: "*"
1099+
- python-version: "!jython2.7" # Test Jython with Auth/NoSSL
1100+
auth: "auth"
1101+
ssl: "nossl"
1102+
coverage: "*"
1103+
- # PYTHON-498: disable Jython SSL tests
1104+
python-version: "jython2.7"
1105+
# EVG-1410: exlcude_spec must specifiy values for all axes
1106+
auth: "*"
1107+
ssl: "ssl"
1108+
coverage: "*"
11021109
display_name: "${python-version} Ubuntu 12.04 (x86_64) ${auth} ${ssl} ${coverage}"
11031110
run_on: ubuntu1204-test
11041111
tasks:
@@ -1127,14 +1134,13 @@ buildvariants:
11271134
- ".2.6"
11281135

11291136
- matrix_name: "tests-python-version-green-framework-ubuntu1204"
1130-
matrix_spec: {"python-version": "*", "green-framework": "*", auth: "*", ssl: "*"}
1137+
matrix_spec: {"python-version": "*", "green-framework": "*", auth-ssl: "*"}
11311138
exclude_spec:
11321139
# Don't test green frameworks on these Python versions.
11331140
- python-version: ["pypy", "pypy3", "jython2.7"]
11341141
green-framework: "*"
1135-
auth: "*"
1136-
ssl: "*"
1137-
display_name: "${green-framework} ${python-version} Ubuntu 12.04 (x86_64) ${auth} ${ssl}"
1142+
auth-ssl: "*"
1143+
display_name: "${green-framework} ${python-version} Ubuntu 12.04 (x86_64) ${auth-ssl}"
11381144
run_on: ubuntu1204-test
11391145
tasks:
11401146
- ".latest"
@@ -1145,9 +1151,9 @@ buildvariants:
11451151

11461152
# Test CPython 3.4 against all versions on MongoDB >= 2.6
11471153
# on Windows with Visual Studio 2010.
1148-
- matrix_name: "tests-windows-vs2010-python-version-nossl"
1149-
matrix_spec: {windows-vs2010-python-version: "*", auth: "*", ssl: "*"}
1150-
display_name: "Windows 64 Visual Studio 2010 ${windows-vs2010-python-version} ${auth} ${ssl}"
1154+
- matrix_name: "tests-windows-vs2010-python-version"
1155+
matrix_spec: {windows-vs2010-python-version: "*", auth-ssl: "*"}
1156+
display_name: "Windows 64 Visual Studio 2010 ${windows-vs2010-python-version} ${auth-ssl}"
11511157
run_on: windows-64-vs2010-test
11521158
tasks:
11531159
- ".latest"
@@ -1158,9 +1164,9 @@ buildvariants:
11581164

11591165
# Test CPython 2.6, 2.7, 3.5 and 3.6 against all versions on MongoDB >= 2.6
11601166
# on Windows with the Microsoft Visual C++ Compiler for Python 2.7 or Visual Studio 2015.
1161-
- matrix_name: "tests-windows-vs2015-python-version-nossl"
1162-
matrix_spec: {windows-vs2015-python-version: "*", auth: "*", ssl: "*"}
1163-
display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth} ${ssl}"
1167+
- matrix_name: "tests-windows-vs2015-python-version"
1168+
matrix_spec: {windows-vs2015-python-version: "*", auth-ssl: "*"}
1169+
display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth-ssl}"
11641170
run_on: windows-64-vs2015-test
11651171
tasks:
11661172
- ".latest"

0 commit comments

Comments
 (0)