@@ -1833,6 +1833,10 @@ axes:
1833
1833
display_name : " PyPy 3.6"
1834
1834
variables :
1835
1835
PYTHON_BINARY : " /opt/python/pypy3.6/bin/pypy3"
1836
+ - id : " pypy3.7"
1837
+ display_name : " PyPy 3.7"
1838
+ variables :
1839
+ PYTHON_BINARY : " /opt/python/pypy3.7/bin/pypy3"
1836
1840
- id : " jython2.7"
1837
1841
display_name : " Jython 2.7"
1838
1842
batchtime : 10080 # 7 days
@@ -2194,26 +2198,26 @@ buildvariants:
2194
2198
- " .4.4"
2195
2199
- " .4.2"
2196
2200
2197
- - matrix_name : " tests-python-version-rhel62 -test-ssl"
2201
+ - matrix_name : " tests-python-version-amazon1 -test-ssl"
2198
2202
matrix_spec :
2199
- platform : rhel62
2203
+ platform : awslinux
2200
2204
# RHEL 6.2 does not support Python 3.7.x and later.
2201
- python-version : &rhel62 -pythons ["2.7", "3.4", "3.5", "3.6", "pypy", "pypy3.5", "pypy3.6", "jython2.7"]
2205
+ python-version : &amazon1 -pythons ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", " pypy", "pypy3.5", "pypy3.6", "pypy3.7 ", "jython2.7"]
2202
2206
auth : " *"
2203
2207
ssl : " *"
2204
2208
coverage : " *"
2205
2209
exclude_spec :
2206
- - platform : rhel62
2210
+ - platform : awslinux
2207
2211
python-version : " *"
2208
2212
auth : " noauth"
2209
2213
ssl : " ssl"
2210
2214
coverage : " *"
2211
- - platform : rhel62
2215
+ - platform : awslinux
2212
2216
python-version : " !jython2.7" # Test Jython with Auth/NoSSL
2213
2217
auth : " auth"
2214
2218
ssl : " nossl"
2215
2219
coverage : " *"
2216
- - platform : rhel62
2220
+ - platform : awslinux
2217
2221
# PYTHON-498: disable Jython SSL tests
2218
2222
python-version : " jython2.7"
2219
2223
# EVG-1410: exlcude_spec must specifiy values for all axes
@@ -2246,7 +2250,7 @@ buildvariants:
2246
2250
- matrix_name : " tests-pyopenssl-pypy"
2247
2251
matrix_spec :
2248
2252
platform : debian92
2249
- python-version : ["pypy", "pypy3.5", "pypy3.6"]
2253
+ python-version : ["pypy", "pypy3.5", "pypy3.6", "pypy3.7" ]
2250
2254
auth : " auth"
2251
2255
ssl : " ssl"
2252
2256
pyopenssl : " *"
@@ -2289,11 +2293,11 @@ buildvariants:
2289
2293
tasks :
2290
2294
- ' .replica_set'
2291
2295
2292
- - matrix_name : " tests-python-version-rhel62 -test-encryption"
2296
+ - matrix_name : " tests-python-version-amazon1 -test-encryption"
2293
2297
matrix_spec :
2294
- platform : rhel62
2298
+ platform : awslinux
2295
2299
# RHEL 6.2 does not support Python 3.7.x and later.
2296
- python-version : ["2.7", "3.4", "3.5", "3.6"]
2300
+ python-version : ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9" ]
2297
2301
auth-ssl : noauth-nossl
2298
2302
# TODO: dependency error for 'coverage-report' task:
2299
2303
# dependency tests-python-version-rhel62-test-encryption_.../test-2.6-standalone is not present in the project config
@@ -2305,56 +2309,40 @@ buildvariants:
2305
2309
- matrix_name : " tests-pypy-debian-test-encryption"
2306
2310
matrix_spec :
2307
2311
platform : debian92
2308
- python-version : ["pypy", "pypy3.5", "pypy3.6"]
2312
+ python-version : ["pypy", "pypy3.5", "pypy3.6", "pypy3.7" ]
2309
2313
auth-ssl : noauth-nossl
2310
2314
encryption : " *"
2311
2315
display_name : " Encryption ${python-version} ${platform} ${auth-ssl}"
2312
2316
tasks : *encryption-server-versions
2313
2317
2314
- - matrix_name : " tests-python-version-rhel62 -without-c-extensions"
2318
+ - matrix_name : " tests-python-version-amazon1 -without-c-extensions"
2315
2319
matrix_spec :
2316
- platform : rhel62
2317
- python-version : *rhel62 -pythons
2320
+ platform : awslinux
2321
+ python-version : *amazon1 -pythons
2318
2322
c-extensions : without-c-extensions
2319
2323
auth-ssl : noauth-nossl
2320
2324
coverage : " *"
2321
2325
exclude_spec :
2322
2326
# These interpreters are always tested without extensions.
2323
- - platform : rhel62
2324
- python-version : ["pypy", "pypy3.5", "pypy3.6", "jython2.7"]
2327
+ - platform : awslinux
2328
+ python-version : ["pypy", "pypy3.5", "pypy3.6", "pypy3.7", " jython2.7"]
2325
2329
c-extensions : " *"
2326
2330
auth-ssl : " *"
2327
2331
coverage : " *"
2328
2332
display_name : " ${c-extensions} ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
2329
2333
tasks : *all-server-versions
2330
2334
2331
- - matrix_name : " tests-python-version-ubuntu1604-without-c-extensions"
2332
- matrix_spec :
2333
- platform : ubuntu-16.04
2334
- python-version : &openssl-102-plus-pythons ["3.7", "3.8", "3.9"]
2335
- c-extensions : without-c-extensions
2336
- auth-ssl : noauth-nossl
2337
- display_name : " ${c-extensions} ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
2338
- tasks :
2339
- - " .latest"
2340
- - " .4.4"
2341
- - " .4.2"
2342
- - " .4.0"
2343
- - " .3.6"
2344
- - " .3.4"
2345
- - " .3.2"
2346
-
2347
2335
- matrix_name : " tests-python-version-ubuntu16-compression"
2348
2336
matrix_spec :
2349
2337
# Ubuntu 16.04 images have libsnappy-dev installed, and provides OpenSSL 1.0.2 for testing Python 3.7
2350
2338
platform : ubuntu-16.04
2351
- python-version : ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "pypy", "pypy3.5", "pypy3.6", "jython2.7"]
2339
+ python-version : ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "pypy", "pypy3.5", "pypy3.6", "pypy3.7", " jython2.7"]
2352
2340
c-extensions : " *"
2353
2341
compression : " *"
2354
2342
exclude_spec :
2355
2343
# These interpreters are always tested without extensions.
2356
2344
- platform : ubuntu-16.04
2357
- python-version : ["pypy", "pypy3.5", "pypy3.6", "jython2.7"]
2345
+ python-version : ["pypy", "pypy3.5", "pypy3.6", "pypy3.7", " jython2.7"]
2358
2346
c-extensions : " with-c-extensions"
2359
2347
compression : " *"
2360
2348
# Jython doesn't support some compression types.
@@ -2383,16 +2371,16 @@ buildvariants:
2383
2371
- " test-4.0-standalone"
2384
2372
- " test-3.6-standalone"
2385
2373
2386
- - matrix_name : " tests-python-version-green-framework-rhel62 "
2374
+ - matrix_name : " tests-python-version-green-framework-amazon1 "
2387
2375
matrix_spec :
2388
- platform : rhel62
2389
- python-version : *rhel62 -pythons
2376
+ platform : awslinux
2377
+ python-version : *amazon1 -pythons
2390
2378
green-framework : " *"
2391
2379
auth-ssl : " *"
2392
2380
exclude_spec :
2393
2381
# Don't test green frameworks on these Python versions.
2394
- - platform : rhel62
2395
- python-version : ["pypy", "pypy3.5", "pypy3.6", "jython2.7"]
2382
+ - platform : awslinux
2383
+ python-version : ["pypy", "pypy3.5", "pypy3.6", "pypy3.7", " jython2.7"]
2396
2384
green-framework : " *"
2397
2385
auth-ssl : " *"
2398
2386
display_name : " ${green-framework} ${python-version} ${platform} ${auth-ssl}"
@@ -2414,35 +2402,16 @@ buildvariants:
2414
2402
display_name : " ${platform} ${python-version-windows-32} ${auth-ssl}"
2415
2403
tasks : *all-server-versions
2416
2404
2417
- - matrix_name : " tests-python-version-requires-openssl-102-plus-test-ssl"
2418
- matrix_spec :
2419
- platform : ubuntu-16.04
2420
- python-version : *openssl-102-plus-pythons
2421
- auth-ssl : " *"
2422
- display_name : " ${python-version} OpenSSL 1.0.2 ${platform} ${auth-ssl}"
2423
- tasks :
2424
- - " .latest"
2425
- - " .4.4"
2426
- - " .4.2"
2427
- - " .4.0"
2428
- - " .3.6"
2429
- - " .3.4"
2430
- - " .3.2"
2431
-
2432
- - matrix_name : " tests-python-version-requires-openssl-102-plus-test-encryption"
2433
- matrix_spec :
2434
- platform : ubuntu-16.04
2435
- python-version : *openssl-102-plus-pythons
2436
- auth-ssl : " noauth-nossl"
2437
- encryption : " *"
2438
- display_name : " Encryption ${python-version} ${platform} ${auth-ssl}"
2439
- tasks : *encryption-server-versions
2440
-
2441
2405
- matrix_name : " tests-python-version-supports-openssl-110-test-ssl"
2442
2406
matrix_spec :
2443
2407
platform : debian92
2444
- python-version : *openssl-102-plus-pythons
2445
- auth-ssl : " *"
2408
+ python-version : *amazon1-pythons
2409
+ auth-ssl : " auth-ssl"
2410
+ exclude_spec :
2411
+ # Python 3.4 doesn't support OpenSSL 1.1.0+ so won't build on Debian 9+.
2412
+ - platform : debian92
2413
+ python-version : ["3.4"]
2414
+ auth-ssl : " auth-ssl"
2446
2415
display_name : " ${python-version} OpenSSL 1.1.0 ${platform} ${auth-ssl}"
2447
2416
tasks :
2448
2417
- " .latest"
@@ -2456,16 +2425,16 @@ buildvariants:
2456
2425
display_name : " Encryption ${platform} ${python-version-windows} ${auth-ssl}"
2457
2426
tasks : *encryption-server-versions
2458
2427
2459
- # Storage engine tests on RHEL 6.2 (x86_64) with Python 2.7.
2428
+ # Storage engine tests on Amazon1 (x86_64) with Python 2.7.
2460
2429
- matrix_name : " tests-storage-engines"
2461
2430
matrix_spec :
2462
- platform : rhel62
2431
+ platform : awslinux
2463
2432
storage-engine : " *"
2464
2433
python-version : 2.7
2465
2434
display_name : " Storage ${storage-engine} ${python-version} ${platform}"
2466
2435
rules :
2467
2436
- if :
2468
- platform : rhel62
2437
+ platform : awslinux
2469
2438
storage-engine : ["inmemory"]
2470
2439
python-version : " *"
2471
2440
then :
@@ -2479,7 +2448,7 @@ buildvariants:
2479
2448
- " test-3.2-standalone"
2480
2449
- if :
2481
2450
# MongoDB 4.2 drops support for MMAPv1
2482
- platform : rhel62
2451
+ platform : awslinux
2483
2452
storage-engine : ["mmapv1"]
2484
2453
python-version : " *"
2485
2454
then :
@@ -2492,7 +2461,7 @@ buildvariants:
2492
2461
- " test-3.2-standalone"
2493
2462
- if :
2494
2463
# No need to test this on later server versions as it becomes the default
2495
- platform : rhel62
2464
+ platform : awslinux
2496
2465
storage-engine : ["wiredtiger"]
2497
2466
python-version : " *"
2498
2467
then :
@@ -2502,7 +2471,7 @@ buildvariants:
2502
2471
# enableTestCommands=0 tests on RHEL 6.2 (x86_64) with Python 2.7.
2503
2472
- matrix_name : " test-disableTestCommands"
2504
2473
matrix_spec :
2505
- platform : rhel62
2474
+ platform : awslinux
2506
2475
disableTestCommands : " *"
2507
2476
python-version : " 2.7"
2508
2477
display_name : " Disable test commands ${python-version} ${platform}"
@@ -2512,7 +2481,7 @@ buildvariants:
2512
2481
# setdefaultencoding tests on RHEL 6.2 (x86_64) with Python 2.7.
2513
2482
- matrix_name : " test-setdefaultencoding"
2514
2483
matrix_spec :
2515
- platform : rhel62
2484
+ platform : awslinux
2516
2485
setdefaultencoding : " *"
2517
2486
python-version : " 2.7"
2518
2487
display_name : " setdefaultencoding ${python-version} ${platform}"
@@ -2521,8 +2490,8 @@ buildvariants:
2521
2490
2522
2491
- matrix_name : " test-linux-enterprise-auth"
2523
2492
matrix_spec :
2524
- platform : rhel62
2525
- python-version : *rhel62 -pythons
2493
+ platform : awslinux
2494
+ python-version : *amazon1 -pythons
2526
2495
auth : " auth"
2527
2496
display_name : " Enterprise ${auth} ${platform} ${python-version}"
2528
2497
tasks :
@@ -2539,33 +2508,38 @@ buildvariants:
2539
2508
2540
2509
- matrix_name : " tests-mod-wsgi"
2541
2510
matrix_spec :
2542
- platform : rhel62
2543
- python-version : ["2.7", "3.4", "3.6"]
2511
+ platform : awslinux
2512
+ python-version : ["2.7", "3.4", "3.6", "3.7", "3.8", "3.9" ]
2544
2513
mod-wsgi-version : " *"
2514
+ exclude_spec :
2515
+ # mod-wsgi 3.5 won't build against CPython 3.8+
2516
+ - platform : awslinux
2517
+ python-version : ["3.8", "3.9"]
2518
+ mod-wsgi-version : " 3"
2545
2519
display_name : " ${mod-wsgi-version} ${python-version} ${platform}"
2546
2520
tasks :
2547
2521
- name : " mod-wsgi-standalone"
2548
2522
- name : " mod-wsgi-replica-set"
2549
2523
2550
2524
- matrix_name : " mockupdb-tests"
2551
2525
matrix_spec :
2552
- platform : rhel62
2526
+ platform : awslinux
2553
2527
python-version : 2.7
2554
2528
display_name : " MockupDB Tests"
2555
2529
tasks :
2556
2530
- name : " mockupdb"
2557
2531
2558
2532
- matrix_name : " tests-doctests"
2559
2533
matrix_spec :
2560
- platform : rhel62
2534
+ platform : awslinux
2561
2535
python-version : ["2.7", "3.4"]
2562
2536
display_name : " Doctests ${python-version} ${platform}"
2563
2537
tasks :
2564
2538
- name : " doctests"
2565
2539
2566
2540
- matrix_name : " cdecimal"
2567
2541
matrix_spec :
2568
- platform : rhel62
2542
+ platform : awslinux
2569
2543
python-version : 2.7
2570
2544
display_name : " cdecimal ${python-version} ${platform}"
2571
2545
tasks :
@@ -2574,7 +2548,7 @@ buildvariants:
2574
2548
- name : " no-server"
2575
2549
display_name : " No server test"
2576
2550
run_on :
2577
- - rhel62-small
2551
+ - amazon1-2018-test
2578
2552
tasks :
2579
2553
- name : " no-server"
2580
2554
expansions :
@@ -2598,16 +2572,8 @@ buildvariants:
2598
2572
2599
2573
- matrix_name : " atlas-connect"
2600
2574
matrix_spec :
2601
- platform : rhel62
2602
- python-version : *rhel62-pythons
2603
- display_name : " Atlas connect ${python-version} ${platform}"
2604
- tasks :
2605
- - name : " atlas-connect"
2606
-
2607
- - matrix_name : " atlas-connect-openssl-102-plus"
2608
- matrix_spec :
2609
- platform : debian92
2610
- python-version : *openssl-102-plus-pythons
2575
+ platform : awslinux
2576
+ python-version : *amazon1-pythons
2611
2577
display_name : " Atlas connect ${python-version} ${platform}"
2612
2578
tasks :
2613
2579
- name : " atlas-connect"
@@ -2649,7 +2615,7 @@ buildvariants:
2649
2615
- matrix_name : " ocsp-test-pypy"
2650
2616
matrix_spec :
2651
2617
platform : debian92
2652
- python-version : ["pypy", "pypy3.5", "pypy3.6"]
2618
+ python-version : ["pypy", "pypy3.5", "pypy3.6", "pypy3.7" ]
2653
2619
mongodb-version : ["4.4", "latest"]
2654
2620
auth : " noauth"
2655
2621
ssl : " ssl"
0 commit comments