@@ -1336,6 +1336,33 @@ tasks:
1336
1336
TOPOLOGY : " sharded_cluster"
1337
1337
- func : " run tests"
1338
1338
1339
+ - name : " test-6.0-standalone"
1340
+ tags : ["6.0", "standalone"]
1341
+ commands :
1342
+ - func : " bootstrap mongo-orchestration"
1343
+ vars :
1344
+ VERSION : " 6.0"
1345
+ TOPOLOGY : " server"
1346
+ - func : " run tests"
1347
+
1348
+ - name : " test-6.0-replica_set"
1349
+ tags : ["6.0", "replica_set"]
1350
+ commands :
1351
+ - func : " bootstrap mongo-orchestration"
1352
+ vars :
1353
+ VERSION : " 6.0"
1354
+ TOPOLOGY : " replica_set"
1355
+ - func : " run tests"
1356
+
1357
+ - name : " test-6.0-sharded_cluster"
1358
+ tags : ["6.0", "sharded_cluster"]
1359
+ commands :
1360
+ - func : " bootstrap mongo-orchestration"
1361
+ vars :
1362
+ VERSION : " 6.0"
1363
+ TOPOLOGY : " sharded_cluster"
1364
+ - func : " run tests"
1365
+
1339
1366
- name : " test-latest-standalone"
1340
1367
tags : ["latest", "standalone"]
1341
1368
commands :
@@ -2341,12 +2368,9 @@ buildvariants:
2341
2368
platform :
2342
2369
# OSes that support versions of MongoDB>=2.6 with SSL.
2343
2370
- awslinux
2344
- - rhel70
2345
2371
auth-ssl : " *"
2346
2372
display_name : " ${platform} ${auth-ssl}"
2347
- tasks : &all-server-versions
2348
- - " .rapid"
2349
- - " .latest"
2373
+ tasks : &aws-server-versions
2350
2374
- " .5.0"
2351
2375
- " .4.4"
2352
2376
- " .4.2"
@@ -2357,17 +2381,45 @@ buildvariants:
2357
2381
- " .3.0"
2358
2382
- " .2.6"
2359
2383
2384
+ - matrix_name : " tests-all-rhel70"
2385
+ matrix_spec :
2386
+ platform :
2387
+ # OSes that support versions of MongoDB>=2.6 with SSL.
2388
+ - rhel70
2389
+ auth-ssl : " *"
2390
+ display_name : " ${platform} ${auth-ssl}"
2391
+ tasks : &rhel-server-versions
2392
+ - " .rapid"
2393
+ - " .latest"
2394
+ - " .6.0"
2395
+
2360
2396
- matrix_name : " tests-all-encryption"
2361
2397
matrix_spec :
2362
2398
platform :
2363
2399
# OSes that support versions of MongoDB>=2.6 with SSL.
2364
2400
- awslinux
2401
+ auth-ssl : " *"
2402
+ encryption : " *"
2403
+ display_name : " Encryption ${platform} ${auth-ssl}"
2404
+ tasks : &aws-encryption-server-versions
2405
+ - " .5.0"
2406
+ - " .4.4"
2407
+ - " .4.2"
2408
+ - " .4.0"
2409
+ - " .2.6"
2410
+
2411
+ - matrix_name : " tests-all-encryption-rhel70"
2412
+ matrix_spec :
2413
+ platform :
2414
+ # OSes that support versions of MongoDB>=2.6 with SSL.
2365
2415
- rhel70
2366
2416
auth-ssl : " *"
2367
2417
encryption : " *"
2368
2418
display_name : " Encryption ${platform} ${auth-ssl}"
2369
- tasks : &encryption-server-versions
2419
+ tasks : &rhel- encryption-server-versions
2370
2420
- " .latest"
2421
+ - " .rapid"
2422
+ - " .6.0"
2371
2423
- " .5.0"
2372
2424
- " .4.4"
2373
2425
- " .4.2"
@@ -2432,7 +2484,7 @@ buildvariants:
2432
2484
ssl : " nossl"
2433
2485
encryption : " *"
2434
2486
display_name : " Encryption ${platform} ${auth} ${ssl}"
2435
- tasks : *encryption-server-versions
2487
+ tasks : *rhel- encryption-server-versions
2436
2488
2437
2489
- matrix_name : " test-os-requires-34-no-42plus"
2438
2490
matrix_spec :
@@ -2485,7 +2537,18 @@ buildvariants:
2485
2537
ssl : " ssl"
2486
2538
coverage : " *"
2487
2539
display_name : " ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
2488
- tasks : *all-server-versions
2540
+ tasks : *aws-server-versions
2541
+
2542
+ - matrix_name : " tests-python-version-rhel70-test-ssl"
2543
+ matrix_spec :
2544
+ platform : rhel70
2545
+ # RHEL 7.0 does not support Python 3.7.x and later.
2546
+ python-version : &rhel70-pythons ["2.7", "3.5", "3.6"]
2547
+ auth : " *"
2548
+ ssl : " *"
2549
+ coverage : " *"
2550
+ display_name : " ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
2551
+ tasks : *rhel-server-versions
2489
2552
2490
2553
- matrix_name : " tests-python-version-ubuntu20-ssl"
2491
2554
matrix_spec :
@@ -2575,7 +2638,7 @@ buildvariants:
2575
2638
# coverage: "*"
2576
2639
encryption : " *"
2577
2640
display_name : " Encryption ${python-version} ${platform} ${auth-ssl}"
2578
- tasks : *encryption-server-versions
2641
+ tasks : *aws- encryption-server-versions
2579
2642
2580
2643
- matrix_name : " tests-pypy-debian-test-encryption"
2581
2644
matrix_spec :
@@ -2584,7 +2647,7 @@ buildvariants:
2584
2647
auth-ssl : noauth-nossl
2585
2648
encryption : " *"
2586
2649
display_name : " Encryption ${python-version} ${platform} ${auth-ssl}"
2587
- tasks : *encryption-server-versions
2650
+ tasks : *rhel- encryption-server-versions
2588
2651
2589
2652
- matrix_name : " tests-python-version-amazon1-without-c-extensions"
2590
2653
matrix_spec :
@@ -2601,7 +2664,17 @@ buildvariants:
2601
2664
auth-ssl : " *"
2602
2665
coverage : " *"
2603
2666
display_name : " ${c-extensions} ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
2604
- tasks : *all-server-versions
2667
+ tasks : *aws-server-versions
2668
+
2669
+ - matrix_name : " tests-python-version-rhel70-without-c-extensions"
2670
+ matrix_spec :
2671
+ platform : rhel70
2672
+ python-version : *rhel70-pythons
2673
+ c-extensions : without-c-extensions
2674
+ auth-ssl : noauth-nossl
2675
+ coverage : " *"
2676
+ display_name : " ${c-extensions} ${python-version} ${platform} ${auth} ${ssl} ${coverage}"
2677
+ tasks : *rhel-server-versions
2605
2678
2606
2679
- matrix_name : " tests-python-version-compression"
2607
2680
matrix_spec :
@@ -2656,15 +2729,36 @@ buildvariants:
2656
2729
green-framework : " *"
2657
2730
auth-ssl : " *"
2658
2731
display_name : " ${green-framework} ${python-version} ${platform} ${auth-ssl}"
2659
- tasks : *all-server-versions
2732
+ tasks : *aws-server-versions
2733
+
2734
+ - matrix_name : " tests-python-version-green-framework-rhel70"
2735
+ matrix_spec :
2736
+ platform : rhel70
2737
+ python-version : *rhel70-pythons
2738
+ green-framework : " *"
2739
+ auth-ssl : " *"
2740
+ display_name : " ${green-framework} ${python-version} ${platform} ${auth-ssl}"
2741
+ tasks : *rhel-server-versions
2660
2742
2661
2743
- matrix_name : " tests-windows-python-version"
2662
2744
matrix_spec :
2663
2745
platform : windows-64-vsMulti-small
2664
2746
python-version-windows : " *"
2665
2747
auth-ssl : " *"
2666
2748
display_name : " ${platform} ${python-version-windows} ${auth-ssl}"
2667
- tasks : *all-server-versions
2749
+ tasks : &all-server-versions
2750
+ - " .latest"
2751
+ - " .rapid"
2752
+ - " .6.0"
2753
+ - " .5.0"
2754
+ - " .4.4"
2755
+ - " .4.2"
2756
+ - " .4.0"
2757
+ - " .3.6"
2758
+ - " .3.4"
2759
+ - " .3.2"
2760
+ - " .3.0"
2761
+ - " .2.6"
2668
2762
rules :
2669
2763
# Python 3.10+ and MongoDB <= 3.4 don't have any TLS ciphers in common.
2670
2764
- if :
@@ -2744,7 +2838,7 @@ buildvariants:
2744
2838
auth-ssl : " *"
2745
2839
encryption : " *"
2746
2840
display_name : " Encryption ${platform} ${python-version-windows} ${auth-ssl}"
2747
- tasks : *encryption-server-versions
2841
+ tasks : *rhel- encryption-server-versions
2748
2842
rules :
2749
2843
# Python 3.10+ and MongoDB <= 3.4 don't have any TLS ciphers in common.
2750
2844
- if :
0 commit comments