@@ -1336,6 +1336,33 @@ tasks:
13361336 TOPOLOGY : " sharded_cluster"
13371337 - func : " run tests"
13381338
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+
13391366 - name : " test-latest-standalone"
13401367 tags : ["latest", "standalone"]
13411368 commands :
@@ -2341,12 +2368,9 @@ buildvariants:
23412368 platform :
23422369 # OSes that support versions of MongoDB>=2.6 with SSL.
23432370 - awslinux
2344- - rhel70
23452371 auth-ssl : " *"
23462372 display_name : " ${platform} ${auth-ssl}"
2347- tasks : &all-server-versions
2348- - " .rapid"
2349- - " .latest"
2373+ tasks : &aws-server-versions
23502374 - " .5.0"
23512375 - " .4.4"
23522376 - " .4.2"
@@ -2357,17 +2381,45 @@ buildvariants:
23572381 - " .3.0"
23582382 - " .2.6"
23592383
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+
23602396- matrix_name : " tests-all-encryption"
23612397 matrix_spec :
23622398 platform :
23632399 # OSes that support versions of MongoDB>=2.6 with SSL.
23642400 - 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.
23652415 - rhel70
23662416 auth-ssl : " *"
23672417 encryption : " *"
23682418 display_name : " Encryption ${platform} ${auth-ssl}"
2369- tasks : &encryption-server-versions
2419+ tasks : &rhel- encryption-server-versions
23702420 - " .latest"
2421+ - " .rapid"
2422+ - " .6.0"
23712423 - " .5.0"
23722424 - " .4.4"
23732425 - " .4.2"
@@ -2432,7 +2484,7 @@ buildvariants:
24322484 ssl : " nossl"
24332485 encryption : " *"
24342486 display_name : " Encryption ${platform} ${auth} ${ssl}"
2435- tasks : *encryption-server-versions
2487+ tasks : *rhel- encryption-server-versions
24362488
24372489- matrix_name : " test-os-requires-34-no-42plus"
24382490 matrix_spec :
@@ -2485,7 +2537,18 @@ buildvariants:
24852537 ssl : " ssl"
24862538 coverage : " *"
24872539 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
24892552
24902553- matrix_name : " tests-python-version-ubuntu20-ssl"
24912554 matrix_spec :
@@ -2575,7 +2638,7 @@ buildvariants:
25752638# coverage: "*"
25762639 encryption : " *"
25772640 display_name : " Encryption ${python-version} ${platform} ${auth-ssl}"
2578- tasks : *encryption-server-versions
2641+ tasks : *aws- encryption-server-versions
25792642
25802643- matrix_name : " tests-pypy-debian-test-encryption"
25812644 matrix_spec :
@@ -2584,7 +2647,7 @@ buildvariants:
25842647 auth-ssl : noauth-nossl
25852648 encryption : " *"
25862649 display_name : " Encryption ${python-version} ${platform} ${auth-ssl}"
2587- tasks : *encryption-server-versions
2650+ tasks : *rhel- encryption-server-versions
25882651
25892652- matrix_name : " tests-python-version-amazon1-without-c-extensions"
25902653 matrix_spec :
@@ -2601,7 +2664,17 @@ buildvariants:
26012664 auth-ssl : " *"
26022665 coverage : " *"
26032666 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
26052678
26062679- matrix_name : " tests-python-version-compression"
26072680 matrix_spec :
@@ -2656,15 +2729,36 @@ buildvariants:
26562729 green-framework : " *"
26572730 auth-ssl : " *"
26582731 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
26602742
26612743- matrix_name : " tests-windows-python-version"
26622744 matrix_spec :
26632745 platform : windows-64-vsMulti-small
26642746 python-version-windows : " *"
26652747 auth-ssl : " *"
26662748 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"
26682762 rules :
26692763 # Python 3.10+ and MongoDB <= 3.4 don't have any TLS ciphers in common.
26702764 - if :
@@ -2744,7 +2838,7 @@ buildvariants:
27442838 auth-ssl : " *"
27452839 encryption : " *"
27462840 display_name : " Encryption ${platform} ${python-version-windows} ${auth-ssl}"
2747- tasks : *encryption-server-versions
2841+ tasks : *rhel- encryption-server-versions
27482842 rules :
27492843 # Python 3.10+ and MongoDB <= 3.4 don't have any TLS ciphers in common.
27502844 - if :
0 commit comments