PHPC-1931: Add PHP 8.1 and rename OS axis labels (#1276)

Author: jmikola

.evergreen/config.yml

@@ -1083,6 +1083,10 @@ axes:
   - id: php-versions
     display_name: PHP Version
     values:
+      - id: "8.1"
+        display_name: "PHP 8.1"
+        variables:
+          PHP_VERSION: "8.1"
       - id: "8.0"
         display_name: "PHP 8.0"
         variables:
@@ -1115,10 +1119,10 @@ axes:
   - id: os
     display_name: OS
     values:
-      - id: debian92-test
+      - id: debian92
         display_name: "Debian 9.2"
         run_on: debian92-test
-      - id: rhel70-test
+      - id: rhel70
         display_name: "RHEL 7.0"
         run_on: rhel70
       - id: rhel71-power8
@@ -1127,7 +1131,7 @@ axes:
       - id: rhel74-zseries
         display_name: "RHEL 7.4 zSeries"
         run_on: rhel72-zseries-test
-      - id: ubuntu1804-arm64-test
+      - id: ubuntu1804-arm64
         display_name: "Ubuntu 18.04 ARM64"
         run_on: ubuntu1804-arm64-test
       # Pending installation of PHP toolchain on macOS hosts (see: PHPC-869)
@@ -1177,10 +1181,13 @@ buildvariants:
 - matrix_name: "test-php-versions"
   matrix_spec: { "os": "*", "edge-versions": "latest-stable", "php-versions": "*" }
   exclude_spec:
-    - { "os": "ubuntu1804-arm64-test", "edge-versions": "latest-stable", "php-versions": "7.2" }
+    - { "os": "ubuntu1804-arm64", "edge-versions": "latest-stable", "php-versions": "7.2" }
     # MongoDB 5.0+ is not available for rhel74-zseries and rhel71-power8
     - { "os": "rhel74-zseries", "edge-versions": "latest-stable", "php-versions": "*" }
     - { "os": "rhel71-power8", "edge-versions": "latest-stable", "php-versions": "*" }
+    # PHP 8.1 is only available on debian92
+    - { "os": "rhel70", "edge-versions": "latest-stable", "php-versions": "8.1" }
+    - { "os": "ubuntu1804-arm64", "edge-versions": "latest-stable", "php-versions": "8.1" }
   display_name: "${os}, ${edge-versions}, ${php-versions}"
   tasks:
     - name: "test-standalone-ssl"
@@ -1190,7 +1197,7 @@ buildvariants:
 - matrix_name: "test-old-mongodb-versions"
   matrix_spec: { "os": "*", "versions": ["3.0", "3.2", "3.4"], "php-edge-versions": "oldest-supported" }
   exclude_spec:
-    - { "os": "ubuntu1804-arm64-test", "versions": "*", "php-edge-versions": "oldest-supported" }
+    - { "os": "ubuntu1804-arm64", "versions": "*", "php-edge-versions": "oldest-supported" }
     - { "os": "rhel71-power8", "versions": "3.0", "php-edge-versions": "oldest-supported" }
     - { "os": "rhel74-zseries", "versions": ["3.0", "3.2"], "php-edge-versions": "oldest-supported" }
   display_name: "${os}, ${versions}, ${php-edge-versions}"
@@ -1202,7 +1209,7 @@ buildvariants:
 - matrix_name: "test-mongodb-36"
   matrix_spec: { "os": "*", "versions": ["3.6"], "php-edge-versions": "oldest-supported" }
   exclude_spec:
-    - { "os": "ubuntu1804-arm64-test", "versions": "*", "php-edge-versions": "oldest-supported" }
+    - { "os": "ubuntu1804-arm64", "versions": "*", "php-edge-versions": "oldest-supported" }
   display_name: "${os}, ${versions}, ${php-edge-versions}"
   tasks:
     - name: "test-standalone"
@@ -1213,7 +1220,7 @@ buildvariants:
 - matrix_name: "test-mongodb-versions"
   matrix_spec: { "os": "*", "versions": ["4.0", "4.2", "4.4", "5.0", "latest"], "php-edge-versions": "oldest-supported" }
   exclude_spec:
-    - { "os": "ubuntu1804-arm64-test", "versions": "4.0", "php-edge-versions": "oldest-supported" }
+    - { "os": "ubuntu1804-arm64", "versions": "4.0", "php-edge-versions": "oldest-supported" }
     - { "os": "rhel71-power8", "versions": ["5.0", "latest"], "php-edge-versions": "oldest-supported" }
     # rhel74-zseries will be covered by test-mongodb-versions-nossl
     - { "os": "rhel74-zseries", "versions": "*", "php-edge-versions": "oldest-supported" }
@@ -1240,45 +1247,45 @@ buildvariants:
     - name: "test-sharded"
 
 - matrix_name: "mongo-42-storage-engines"
-  matrix_spec: { "os": "debian92-test", "versions": "4.2", "php-edge-versions": "latest-stable", "storage-engine": "inmemory" }
+  matrix_spec: { "os": "debian92", "versions": "4.2", "php-edge-versions": "latest-stable", "storage-engine": "inmemory" }
   display_name: "${storage-engine}: ${os}, ${versions}, ${php-edge-versions}"
   tasks:
     - name: "test-standalone"
 
 - matrix_name: "mongo-40-storage-engines"
-  matrix_spec: { "os": "debian92-test", "versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": "mmapv1" }
+  matrix_spec: { "os": "debian92", "versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": "mmapv1" }
   display_name: "${storage-engine}: ${os}, ${versions}, ${php-edge-versions}"
   tasks:
     - name: "test-standalone"
 
 - matrix_name: "libmongoc-versions"
-  matrix_spec: { "os": "debian92-test", "edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" }
+  matrix_spec: { "os": "debian92", "edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" }
   display_name: "libmongoc ${libmongoc-version}: ${os}, ${edge-versions}, ${php-edge-versions}"
   tasks:
     - name: "test-standalone"
     - name: "test-replicaset"
     - name: "test-sharded"
 
 - matrix_name: "atlas-connectivity-tests"
-  matrix_spec: { "os": "debian92-test", "php-edge-versions": "latest-stable" }
+  matrix_spec: { "os": "debian92", "php-edge-versions": "latest-stable" }
   display_name: "Atlas Connectivity"
   tasks:
     - name: "test-atlas"
 
 - matrix_name: "test-ocsp"
-  matrix_spec: { "os": "debian92-test", "versions": ["4.4", "5.0", "latest"], "php-edge-versions": "latest-stable" }
+  matrix_spec: { "os": "debian92", "versions": ["4.4", "5.0", "latest"], "php-edge-versions": "latest-stable" }
   display_name: "OCSP tests - ${versions}"
   tasks:
     - name: ".ocsp"
 
 - matrix_name: "test-requireApiVersion"
-  matrix_spec: { "os": "debian92-test", "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable" }
+  matrix_spec: { "os": "debian92", "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable" }
   display_name: "Versioned API - ${versions}"
   tasks:
     - name: "test-requireApiVersion"
 
 - matrix_name: "test-loadBalanced"
-  matrix_spec: { "os": "debian92-test", "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable" }
+  matrix_spec: { "os": "debian92", "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable" }
   display_name: "Load balanced - ${versions}"
   tasks:
     - name: "test-loadBalanced"