Skip to content

Commit c6b1c28

Browse files
committed
Evergreen - enable Windows SSL tests
1 parent ffeebbc commit c6b1c28

File tree

1 file changed

+26
-10
lines changed

1 file changed

+26
-10
lines changed

.evergreen/config.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ functions:
361361
cat $i | tr -d '\r' > $i.new
362362
mv $i.new $i
363363
done
364+
# Copy client certificate because symlinks do not work on Windows.
365+
cp ${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem
364366
365367
"make files executable":
366368
- command: shell.exec
@@ -1069,12 +1071,10 @@ buildvariants:
10691071
- name: "test-2.4-sharded_cluster"
10701072
- name: "test-2.4-standalone"
10711073

1072-
# TODO: Figure out SSL on Windows.
1073-
10741074
# Test CPython 3.3 and 3.4 against all versions on MongoDB >= 2.4
10751075
# on Windows with Visual Studio 2010.
10761076
- matrix_name: "tests-windows-vs2010-python-version-nossl"
1077-
matrix_spec: {"windows-vs2010-python-version": "*", auth: "*", ssl: "nossl" }
1077+
matrix_spec: {windows-vs2010-python-version: "*", auth: "*", ssl: "*" }
10781078
display_name: "Windows 64 Visual Studio 2010 ${windows-vs2010-python-version} ${auth} ${ssl}"
10791079
run_on: windows-64-vs2010-test
10801080
tasks:
@@ -1093,14 +1093,22 @@ buildvariants:
10931093
- name: "test-2.6-replica_set"
10941094
- name: "test-2.6-sharded_cluster"
10951095
- name: "test-2.6-standalone"
1096-
- name: "test-2.4-replica_set"
1097-
- name: "test-2.4-sharded_cluster"
1098-
- name: "test-2.4-standalone"
1096+
rules:
1097+
# Windows MongoDB 2.4 does not support SSL.
1098+
- if:
1099+
windows-vs2010-python-version: "*"
1100+
auth: "*"
1101+
ssl: "nossl"
1102+
then:
1103+
add_tasks:
1104+
- name: "test-2.4-replica_set"
1105+
- name: "test-2.4-sharded_cluster"
1106+
- name: "test-2.4-standalone"
10991107

11001108
# Test CPython 2.6, 2.7, 3.2, 3.5 and 3.6 against all versions on MongoDB >= 2.4
11011109
# on Windows with the Microsoft Visual C++ Compiler for Python 2.7 or Visual Studio 2015.
11021110
- matrix_name: "tests-windows-vs2015-python-version-nossl"
1103-
matrix_spec: {"windows-vs2015-python-version": "*", auth: "*", ssl: "nossl" }
1111+
matrix_spec: {windows-vs2015-python-version: "*", auth: "*", ssl: "*" }
11041112
display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth} ${ssl}"
11051113
run_on: windows-64-vs2015-test
11061114
tasks:
@@ -1119,9 +1127,17 @@ buildvariants:
11191127
- name: "test-2.6-replica_set"
11201128
- name: "test-2.6-sharded_cluster"
11211129
- name: "test-2.6-standalone"
1122-
- name: "test-2.4-replica_set"
1123-
- name: "test-2.4-sharded_cluster"
1124-
- name: "test-2.4-standalone"
1130+
rules:
1131+
# Windows MongoDB 2.4 does not support SSL.
1132+
- if:
1133+
windows-vs2015-python-version: "*"
1134+
auth: "*"
1135+
ssl: "nossl"
1136+
then:
1137+
add_tasks:
1138+
- name: "test-2.4-replica_set"
1139+
- name: "test-2.4-sharded_cluster"
1140+
- name: "test-2.4-standalone"
11251141

11261142
# Storage engine tests on Ubuntu 16.04 (x86_64) with Python 2.7.
11271143
- matrix_name: "tests-storage-engines"

0 commit comments

Comments
 (0)