From f90ee2ae35f18e1b8ba1559bc45464b0fdeddc19 Mon Sep 17 00:00:00 2001
From: Prashant Mital <prashantmital@gmail.com>
Date: Mon, 1 Jul 2019 13:18:11 -0700
Subject: [PATCH] PYTHON-1887 Stop testing latest on Archlinux

---
 .evergreen/config.yml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 6612223b9..1de3b6635 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1177,17 +1177,16 @@ buildvariants:
     - ".3.0"
     - ".2.6"
 
-- matrix_name: "tests-nossl"
+- matrix_name: "tests-archlinux"
   matrix_spec:
     platform:
-      # OSes that support versions of MongoDB without SSL.
+      # Archlinux supports MongoDB without SSL.
+      # MongoDB 4.2 drops support for archlinux (generic linux builds).
       - archlinux-test
-      - macos-1012
     auth: "*"
     ssl: "nossl"
   display_name: "${platform} ${auth} ${ssl}"
   tasks:
-    - ".latest"
     - ".4.0"
     - ".3.6"
     - ".3.4"
@@ -1212,13 +1211,20 @@ buildvariants:
     - ".3.4"
     - ".3.2"
 
-- matrix_name: "tests-ssl-requires-32"
+- matrix_name: "test-macos"
   matrix_spec:
     platform:
-      # OSes that introduced support for SSL with MongoDB>=3.2.
+      # MacOS introduced SSL support with MongoDB >= 3.2.
+      # Older server versions (2.6, 3.0) are supported without SSL.
       - macos-1012
-    auth-ssl: "auth-ssl"
-  display_name: "${platform} ${auth-ssl}"
+    auth: "*"
+    ssl: "*"
+  exclude_spec:
+    # No point testing with SSL without auth.
+    - platform: macos-1012
+      auth: "noauth"
+      ssl: "ssl"
+  display_name: "${platform} ${auth} ${ssl}"
   tasks:
     - ".latest"
     - ".4.2"
@@ -1226,6 +1232,15 @@ buildvariants:
     - ".3.6"
     - ".3.4"
     - ".3.2"
+  rules:
+    - if:
+        platform: macos-1012
+        auth: "*"
+        ssl: "nossl"
+      then:
+        add_tasks:
+          - ".3.0"
+          - ".2.6"
 
 - matrix_name: "test-os-requires-34-no-42plus"
   matrix_spec: