From b11b2e1a81a134bb9328dc53bc8c1cb6c15f725b Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Tue, 13 Jul 2021 20:52:11 +0200
Subject: [PATCH] Update tested ext-mongodb versions

---
 .evergreen/config.yml | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 7cfd008f0..37ff9b8b6 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -468,27 +468,23 @@ axes:
   - id: driver-versions
     display_name: Driver Version
     values:
-      # TODO: this axis can be cleaned up as we move towards a 1.10 release:
       # * lowest-supported can be enabled once a 1.10 patch release has been tagged
-      # * latest-stable can be updated when we start tagging 1.10 releases (even beta)
-      # * 1.10-dev can be enabled once 1.10 has been branched
-      # * latest-dev can be enabled once 1.10 has been branched
 #      - id: "lowest-supported"
-#        display_name: "1.10.0-alpha1"
+#        display_name: "1.10.0"
 #        variables:
-#          EXTENSION_VERSION: "1.10.0alpha1"
-      - id: "latest"
-        display_name: "1.10-dev (master)"
+#          EXTENSION_VERSION: "1.10.0"
+      - id: "latest-stable"
+        display_name: "Latest Stable (1.10.x)"
+        variables:
+          EXTENSION_VERSION: "stable"
+      - id: "upcoming-stable"
+        display_name: "1.10-dev"
+        variables:
+          EXTENSION_BRANCH: "v1.10"
+      - id: "latest-dev"
+        display_name: "1.11-dev (master)"
         variables:
           EXTENSION_BRANCH: "master"
-#      - id: "1.10-dev"
-#        display_name: "1.10-dev"
-#        variables:
-#          EXTENSION_BRANCH: "v1.10"
-#      - id: "latest-dev"
-#        display_name: "1.11-dev (master)"
-#        variables:
-#          EXTENSION_BRANCH: "master"
 
   - id: os-php7
     display_name: OS
@@ -578,7 +574,7 @@ buildvariants:
 # Tests all PHP versions on all operating systems.
 # Only tests against latest MongoDB and ext-mongodb versions
 - matrix_name: "test-php-versions"
-  matrix_spec: {"os-php7": "*", "php-versions": "*", "edge-versions": "latest-stable", "driver-versions": "latest" }
+  matrix_spec: {"os-php7": "*", "php-versions": "*", "edge-versions": "latest-stable", "driver-versions": "latest-stable" }
   exclude_spec:
     # rhel71-power8 fails due to not reaching pecl
     - { "os-php7": "rhel71-power8", "php-versions": "*", edge-versions: "*", "driver-versions": "*" }
@@ -604,7 +600,7 @@ buildvariants:
 # Only tests on Ubuntu 18.04, with latest stable PHP and driver versions
 # Tests against various topologies
 - matrix_name: "test-mongodb-versions"
-  matrix_spec: {"os-php7": "rhel70-test", "php-edge-versions": "latest-stable", "versions": "*", "driver-versions": "latest" }
+  matrix_spec: {"os-php7": "rhel70-test", "php-edge-versions": "latest-stable", "versions": "*", "driver-versions": "latest-stable" }
   display_name: "MongoDB ${versions}, PHP ${php-edge-versions}, ${os-php7}, ext-mongodb ${driver-versions}"
   tasks:
     - name: "test-standalone"
@@ -615,7 +611,7 @@ buildvariants:
 # Enables --prefer-lowest for composer to test oldest dependencies against all server versions
 # TODO: driver-versions can be changed back to lowest-supported when that version is enabled in the axis
 - matrix_name: "test-dependencies"
-  matrix_spec: { "dependencies": "lowest", "os-php7": "rhel70-test", "php-edge-versions": "oldest-supported", "versions": "*", "driver-versions": "latest" }
+  matrix_spec: { "dependencies": "lowest", "os-php7": "rhel70-test", "php-edge-versions": "oldest-supported", "versions": "*", "driver-versions": "latest-stable" }
   display_name: "Dependencies: ${dependencies}, MongoDB ${versions}, PHP ${php-edge-versions}, ${os-php7}, ext-mongodb ${driver-versions}"
   tasks:
     - name: "test-standalone"
@@ -623,14 +619,14 @@ buildvariants:
     - name: "test-sharded_cluster"
 
 - matrix_name: "atlas-data-lake-test"
-  matrix_spec: { "php-edge-versions": "latest-stable", "driver-versions": "latest" }
+  matrix_spec: { "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" }
   display_name: "Atlas Data Lake test"
   run_on: rhel70
   tasks:
     - name: "test-atlas-data-lake"
 
 - matrix_name: "test-versioned-api"
-  matrix_spec: { "php-edge-versions": "latest-stable", "versions": ["5.0", "latest"], "driver-versions": "latest" }
+  matrix_spec: { "php-edge-versions": "latest-stable", "versions": ["5.0", "latest"], "driver-versions": "latest-stable" }
   display_name: "Versioned API - ${versions}"
   run_on: rhel70
   tasks: