PYTHON-2603 Standardize on ubuntu1804 zseries, power8, and arm64 (#600)

PYTHON-2647 Fix test_use_openssl_when_available when service_identity<18.1 is installed

.evergreen/config.yml

@@ -1606,16 +1606,6 @@ axes:
         batchtime: 10080  # 7 days
         variables:
           libmongocrypt_url: https://s3.amazonaws.com/mciuploads/libmongocrypt/rhel-70-64-bit/master/latest/libmongocrypt.tar.gz
-      - id: rhel71-power8-test
-        display_name: "RHEL 7.1 (POWER8)"
-        run_on: rhel71-power8-test
-        batchtime: 10080  # 7 days
-      - id: rhel72-zseries-test
-        display_name: "RHEL 7.2 (zSeries)"
-        run_on: rhel72-zseries-test
-        batchtime: 10080  # 7 days
-        variables:
-          libmongocrypt_url: https://s3.amazonaws.com/mciuploads/libmongocrypt/rhel72-zseries-test/master/latest/libmongocrypt.tar.gz
       - id: ubuntu-16.04
         display_name: "Ubuntu 16.04"
         run_on: ubuntu1604-test
@@ -1635,19 +1625,17 @@ axes:
         batchtime: 10080  # 7 days
         variables:
           python3_binary: python3
-      - id: ubuntu1604-arm64-small
-        display_name: "Ubuntu 16.04 (ARM64)"
-        run_on: ubuntu1604-arm64-small
+      - id: ubuntu1804-zseries
+        display_name: "Ubuntu 18.04 (zSeries)"
+        run_on: ubuntu1804-zseries-small
         batchtime: 10080  # 7 days
-        variables:
-          libmongocrypt_url: https://s3.amazonaws.com/mciuploads/libmongocrypt/ubuntu1604-arm64/master/latest/libmongocrypt.tar.gz
-      - id: ubuntu1604-power8-test
-        display_name: "Ubuntu 16.04 (POWER8)"
-        run_on: ubuntu1604-power8-test
+      - id: ubuntu1804-power8
+        display_name: "Ubuntu 18.04 (POWER8)"
+        run_on: ubuntu1804-power8-small
         batchtime: 10080  # 7 days
-      - id: ubuntu1804-arm64-test
+      - id: ubuntu1804-arm64
         display_name: "Ubuntu 18.04 (ARM64)"
-        run_on: ubuntu1804-arm64-test
+        run_on: ubuntu1804-arm64-small
         batchtime: 10080  # 7 days
         variables:
           libmongocrypt_url: https://s3.amazonaws.com/mciuploads/libmongocrypt/ubuntu1804-arm64/master/latest/libmongocrypt.tar.gz
@@ -2009,7 +1997,6 @@ buildvariants:
     platform:
       # OSes that support versions of MongoDB>=3.2 with SSL.
       - ubuntu-16.04
-      - rhel71-power8-test
     auth-ssl: "*"
   display_name: "${platform} ${auth-ssl}"
   tasks:
@@ -2063,60 +2050,25 @@ buildvariants:
   display_name: "Encryption ${platform} ${auth} ${ssl}"
   tasks: *encryption-server-versions
 
-- matrix_name: "test-os-requires-34-no-42plus"
+# Test one server version (4.2) with zSeries, POWER8, and ARM.
+- matrix_name: "test-different-cpu-architectures"
   matrix_spec:
     platform:
-      # OSes that support versions of MongoDB>=3.4 <4.2 with SSL.
-      - ubuntu1604-power8-test
-      - ubuntu1604-arm64-small
+      - ubuntu1804-zseries # Ubuntu 18 or RHEL 8.x?
+      - ubuntu1804-power8 # Ubuntu 18 or RHEL 7?
+      - ubuntu1804-arm64
     auth-ssl: "*"
   display_name: "${platform} ${auth-ssl}"
   tasks:
-    - ".4.0"
-    - ".3.6"
-    - ".3.4"
-
-- matrix_name: "test-os-requires-34"
-  matrix_spec:
-    platform:
-      # OSes that support versions of MongoDB>=3.4 with SSL.
-      - rhel72-zseries-test
-    auth-ssl: "*"
-  display_name: "${platform} ${auth-ssl}"
-  tasks:
-    - ".latest"
-    - ".4.4"
-    - ".4.2"
-    - ".4.0"
-    - ".3.6"
-    - ".3.4"
-
-- matrix_name: "test-os-requires-42"
-  matrix_spec:
-    platform:
-      # OSes that support versions of MongoDB>=4.2 with SSL.
-      - ubuntu1804-arm64-test
-    auth-ssl: "*"
-  display_name: "${platform} ${auth-ssl}"
-  tasks:
-    - ".latest"
-    - ".4.4"
     - ".4.2"
 
 - matrix_name: "tests-python-version-amazon1-test-ssl"
   matrix_spec:
     platform: awslinux
     python-version: &amazon1-pythons ["3.6", "3.7", "3.8", "3.9", "pypy3.6", "pypy3.7"]
-    auth: "*"
-    ssl: "*"
+    auth-ssl: "*"
     coverage: "*"
-  exclude_spec:
-    - platform: awslinux
-      python-version: "*"
-      auth: "noauth"
-      ssl: "ssl"
-      coverage: "*"
-  display_name: "${python-version} ${platform} ${auth} ${ssl} ${coverage}"
+  display_name: "${python-version} ${platform} ${auth-ssl} ${coverage}"
   tasks: *all-server-versions
 
 - matrix_name: "tests-pyopenssl"

test/test_ssl.py

@@ -45,6 +45,8 @@ try:
     import OpenSSL
     import requests
     import service_identity
+    # Ensure service_identity>=18.1 is installed
+    from service_identity.pyopenssl import verify_ip_address
     from pymongo.ocsp_support import _load_trusted_ca_certs
     _HAVE_PYOPENSSL = True
 except ImportError:
@@ -155,7 +157,7 @@ class TestClientSSL(unittest.TestCase):
             ssl.CERT_REQUIRED)
 
     @unittest.skipUnless(_HAVE_PYOPENSSL, "PyOpenSSL is not available.")
-    def test_use_openssl_when_available(self):
+    def test_use_pyopenssl_when_available(self):
         self.assertTrue(_ssl.IS_PYOPENSSL)
 
     @unittest.skipUnless(_HAVE_PYOPENSSL, "Cannot test without PyOpenSSL")