@@ -1298,24 +1298,6 @@ axes:
1298
1298
batchtime : 10080 # 7 days
1299
1299
variables :
1300
1300
libmongocrypt_url : https://s3.amazonaws.com/mciuploads/libmongocrypt/ubuntu1804-arm64/master/latest/libmongocrypt.tar.gz
1301
- - id : windows-vs2010
1302
- display_name : " Windows 64 Visual Studio 2010"
1303
- run_on : windows-64-vs2010-test
1304
- batchtime : 10080 # 7 days
1305
- variables :
1306
- libmongocrypt_url : https://s3.amazonaws.com/mciuploads/libmongocrypt/windows-test/master/latest/libmongocrypt.tar.gz
1307
- - id : windows-vs2015
1308
- display_name : " Windows 64 Visual Studio 2015"
1309
- run_on : windows-64-vs2015-test
1310
- batchtime : 10080 # 7 days
1311
- variables :
1312
- libmongocrypt_url : https://s3.amazonaws.com/mciuploads/libmongocrypt/windows-test/master/latest/libmongocrypt.tar.gz
1313
- - id : windows-vs2017
1314
- display_name : " Windows 64 Visual Studio 2017"
1315
- run_on : windows-64-vs2017-test
1316
- batchtime : 10080 # 7 days
1317
- variables :
1318
- libmongocrypt_url : https://s3.amazonaws.com/mciuploads/libmongocrypt/windows-test/master/latest/libmongocrypt.tar.gz
1319
1301
- id : windows-64-vsMulti-small
1320
1302
display_name : " Windows 64"
1321
1303
run_on : windows-64-vsMulti-small
@@ -1431,40 +1413,71 @@ axes:
1431
1413
batchtime : 10080 # 7 days
1432
1414
variables :
1433
1415
PYTHON_BINARY : " /opt/python/jython2.7/bin/jython"
1434
- # Windows
1435
- - id : " win-vs2010-3.4 "
1436
- display_name : " Python 3.4 "
1416
+ # System python
1417
+ - id : " system-python "
1418
+ display_name : " Python"
1437
1419
variables :
1438
- PYTHON_BINARY : " C:/python/Python34/python.exe"
1439
- - id : " win-vs2015-2.7"
1420
+ PYTHON_BINARY : " python"
1421
+ - id : " system-python3"
1422
+ display_name : " Python3"
1423
+ variables :
1424
+ PYTHON_BINARY : " python3"
1425
+
1426
+ - id : python-version-windows
1427
+ display_name : " Python"
1428
+ values :
1429
+ - id : " 2.7"
1440
1430
display_name : " Python 2.7"
1441
1431
variables :
1442
1432
PYTHON_BINARY : " C:/python/Python27/python.exe"
1443
- - id : " win-vs2015-3.5"
1433
+ - id : " 3.4"
1434
+ display_name : " Python 3.4"
1435
+ variables :
1436
+ PYTHON_BINARY : " C:/python/Python34/python.exe"
1437
+ - id : " 3.5"
1444
1438
display_name : " Python 3.5"
1445
1439
variables :
1446
1440
PYTHON_BINARY : " C:/python/Python35/python.exe"
1447
- - id : " win-vs2015- 3.6"
1441
+ - id : " 3.6"
1448
1442
display_name : " Python 3.6"
1449
1443
variables :
1450
1444
PYTHON_BINARY : " C:/python/Python36/python.exe"
1451
- - id : " win-vs2015- 3.7"
1445
+ - id : " 3.7"
1452
1446
display_name : " Python 3.7"
1453
1447
variables :
1454
1448
PYTHON_BINARY : " C:/python/Python37/python.exe"
1455
- - id : " win-vs2015- 3.8"
1449
+ - id : " 3.8"
1456
1450
display_name : " Python 3.8"
1457
1451
variables :
1458
1452
PYTHON_BINARY : " C:/python/Python38/python.exe"
1459
- # System python
1460
- - id : " system-python"
1461
- display_name : " Python"
1453
+
1454
+ - id : python-version-windows-32
1455
+ display_name : " Python"
1456
+ values :
1457
+ - id : " 2.7"
1458
+ display_name : " 32-bit Python 2.7"
1462
1459
variables :
1463
- PYTHON_BINARY : " python"
1464
- - id : " system-python3 "
1465
- display_name : " Python3 "
1460
+ PYTHON_BINARY : " C:/ python/32/Python27/python.exe "
1461
+ - id : " 3.4 "
1462
+ display_name : " 32-bit Python 3.4 "
1466
1463
variables :
1467
- PYTHON_BINARY : " python3"
1464
+ PYTHON_BINARY : " C:/python/32/Python34/python.exe"
1465
+ - id : " 3.5"
1466
+ display_name : " 32-bit Python 3.5"
1467
+ variables :
1468
+ PYTHON_BINARY : " C:/python/32/Python35/python.exe"
1469
+ - id : " 3.6"
1470
+ display_name : " 32-bit Python 3.6"
1471
+ variables :
1472
+ PYTHON_BINARY : " C:/python/32/Python36/python.exe"
1473
+ - id : " 3.7"
1474
+ display_name : " 32-bit Python 3.7"
1475
+ variables :
1476
+ PYTHON_BINARY : " C:/python/32/Python37/python.exe"
1477
+ - id : " 3.8"
1478
+ display_name : " 32-bit Python 3.8"
1479
+ variables :
1480
+ PYTHON_BINARY : " C:/python/32/Python38/python.exe"
1468
1481
1469
1482
# Choice of mod_wsgi version
1470
1483
- id : mod-wsgi-version
@@ -1590,6 +1603,7 @@ buildvariants:
1590
1603
encryption : " *"
1591
1604
display_name : " Encryption ${platform} ${auth-ssl}"
1592
1605
tasks : &encryption-server-versions
1606
+ - " .latest"
1593
1607
- " .4.2"
1594
1608
- " .4.0"
1595
1609
- " .2.6"
@@ -1805,10 +1819,10 @@ buildvariants:
1805
1819
- matrix_name : " tests-pyopenssl-windows"
1806
1820
matrix_spec :
1807
1821
platform : windows-64-vsMulti-small
1808
- python-version : ["win-vs2015-2.7", "win-vs2010-3.4", "win-vs2015-3.5", "win-vs2015-3.6", "win-vs2015-3.7", "win-vs2015-3.8"]
1822
+ python-version-windows : " * "
1809
1823
auth : " *"
1810
1824
ssl : " ssl"
1811
- display_name : " PyOpenSSL ${platform} ${python-version} ${auth}"
1825
+ display_name : " PyOpenSSL ${platform} ${python-version-windows } ${auth}"
1812
1826
tasks :
1813
1827
- " pyopenssl"
1814
1828
@@ -1910,14 +1924,14 @@ buildvariants:
1910
1924
display_name : " ${green-framework} ${python-version} ${platform} ${auth-ssl}"
1911
1925
tasks : *all-server-versions
1912
1926
1913
- # Test CPython 3.4 against MongoDB 2.6-4.2 on Windows with Visual Studio 2010.
1914
- - matrix_name : " tests-windows-vs2010-python-version"
1927
+ - matrix_name : " tests-windows-python-version"
1915
1928
matrix_spec :
1916
- platform : windows-vs2010
1917
- python-version : &win-vs2010-pythons ["win-vs2010-3.4"]
1929
+ platform : windows-64-vsMulti-small
1930
+ python-version-windows : " * "
1918
1931
auth-ssl : " *"
1919
- display_name : " ${platform} ${python-version} ${auth-ssl}"
1932
+ display_name : " ${platform} ${python-version-windows } ${auth-ssl}"
1920
1933
tasks :
1934
+ - " .latest"
1921
1935
- " .4.2"
1922
1936
- " .4.0"
1923
1937
- " .3.6"
@@ -1926,15 +1940,21 @@ buildvariants:
1926
1940
- " .3.0"
1927
1941
- " .2.6"
1928
1942
1929
- # windows-vs2010 3.4 is unable to dlopen the libmongocrypt ddl built on 2016
1930
- # - matrix_name: "tests-windows-vs2010-python-version-encryption"
1931
- # matrix_spec:
1932
- # platform: windows-vs2010
1933
- # python-version: *win-vs2010-pythons
1934
- # auth-ssl: "*"
1935
- # encryption: "*"
1936
- # display_name: "Encryption ${platform} ${python-version} ${auth-ssl}"
1937
- # tasks: *encryption-server-versions
1943
+ - matrix_name : " tests-windows-python-version-32-bit"
1944
+ matrix_spec :
1945
+ platform : windows-64-vsMulti-small
1946
+ python-version-windows-32 : " *"
1947
+ auth-ssl : " *"
1948
+ display_name : " ${platform} ${python-version-windows-32} ${auth-ssl}"
1949
+ tasks :
1950
+ - " .latest"
1951
+ - " .4.2"
1952
+ - " .4.0"
1953
+ - " .3.6"
1954
+ - " .3.4"
1955
+ - " .3.2"
1956
+ - " .3.0"
1957
+ - " .2.6"
1938
1958
1939
1959
- matrix_name : " tests-python-version-requires-openssl-102-plus-test-ssl"
1940
1960
matrix_spec :
@@ -1968,42 +1988,15 @@ buildvariants:
1968
1988
tasks :
1969
1989
- " .latest"
1970
1990
1971
- # Test CPython 2.7, 3.5 and 3.6 against MongoDB 2.6-4.2
1972
- # on Windows with the Microsoft Visual C++ Compiler for Python 2.7 or Visual Studio 2015.
1973
- - matrix_name : " tests-windows-vs2015-python-version-27plus"
1974
- matrix_spec :
1975
- platform : windows-vs2015
1976
- python-version : &win-vs2015-pythons ["win-vs2015-2.7", "win-vs2015-3.5", "win-vs2015-3.6", "win-vs2015-3.7"]
1977
- auth-ssl : " *"
1978
- display_name : " ${platform} ${python-version} ${auth-ssl}"
1979
- tasks :
1980
- - " .4.2"
1981
- - " .4.0"
1982
- - " .3.6"
1983
- - " .3.4"
1984
- - " .3.2"
1985
- - " .3.0"
1986
- - " .2.6"
1987
-
1988
- - matrix_name : " tests-windows-vs2015-python-version-encryption"
1991
+ - matrix_name : " tests-windows-encryption"
1989
1992
matrix_spec :
1990
- platform : windows-vs2015
1991
- python-version : *win-vs2015-pythons
1993
+ platform : windows-64-vsMulti-small
1994
+ python-version-windows : " * "
1992
1995
auth-ssl : " *"
1993
1996
encryption : " *"
1994
- display_name : " Encryption ${platform} ${python-version} ${auth-ssl}"
1997
+ display_name : " Encryption ${platform} ${python-version-windows } ${auth-ssl}"
1995
1998
tasks : *encryption-server-versions
1996
1999
1997
- # Test CPython 3.7 against MongoDB >= 4.3 on Windows 2017+.
1998
- - matrix_name : " tests-windows-vs2017"
1999
- matrix_spec :
2000
- platform : windows-vs2017
2001
- python-version : ["win-vs2015-3.7"]
2002
- auth-ssl : " *"
2003
- display_name : " ${platform} ${python-version} ${auth-ssl}"
2004
- tasks :
2005
- - .latest
2006
-
2007
2000
# Storage engine tests on RHEL 6.2 (x86_64) with Python 2.7.
2008
2001
- matrix_name : " tests-storage-engines"
2009
2002
matrix_spec :
@@ -2075,21 +2068,12 @@ buildvariants:
2075
2068
tasks :
2076
2069
- name : " test-enterprise-auth"
2077
2070
2078
- - matrix_name : " tests-windows-vs2010- enterprise-auth"
2071
+ - matrix_name : " tests-windows-enterprise-auth"
2079
2072
matrix_spec :
2080
- platform : windows-vs2010
2081
- python-version : *win-vs2010-pythons
2082
- auth : " auth"
2083
- display_name : " Enterprise ${auth} ${platform} ${python-version}"
2084
- tasks :
2085
- - name : " test-enterprise-auth"
2086
-
2087
- - matrix_name : " tests-windows-vs2015-enterprise-auth"
2088
- matrix_spec :
2089
- platform : windows-vs2015
2090
- python-version : *win-vs2015-pythons
2073
+ platform : windows-64-vsMulti-small
2074
+ python-version-windows : " *"
2091
2075
auth : " auth"
2092
- display_name : " Enterprise ${auth} ${platform} ${python-version}"
2076
+ display_name : " Enterprise ${auth} ${platform} ${python-version-windows }"
2093
2077
tasks :
2094
2078
- name : " test-enterprise-auth"
2095
2079
@@ -2189,8 +2173,8 @@ buildvariants:
2189
2173
- matrix_name : " aws-auth-test-windows"
2190
2174
matrix_spec :
2191
2175
platform : [windows-64-vsMulti-small]
2192
- python-version : ["win-vs2015-2.7", "win-vs2010-3.4", "win-vs2015-3.5", "win-vs2015-3.6", "win-vs2015-3.7", "win-vs2015-3.8"]
2193
- display_name : " MONGODB-AWS Auth ${platform} ${python-version}"
2176
+ python-version-windows : " * "
2177
+ display_name : " MONGODB-AWS Auth ${platform} ${python-version-windows }"
2194
2178
tasks :
2195
2179
- name : " aws-auth-test"
2196
2180
0 commit comments