CDRIVER-4580 Move compile-test coverage from macos-1014 to macos-1100 (#1208)

* Avoid expansions from interfering with Python package installation

* CDRIVER-4580 Migrate cse.darwinssl matrix from macos-1015 to macos-1100

* CDRIVER-3483 Remove disabling of ZSTD tests on MacOS

* CDRIVER-4580 Migrate sasl.darwinssl tests from macos-1014 to macos-1100

* Disable macos-1015 compile task in sasl.darwinssl

* Move scan-build from macos-1014 to macos-1100

Author: eramongodb

.evergreen/config_generator/components/cse/darwinssl.py

@@ -14,15 +14,15 @@
 # pylint: disable=line-too-long
 # fmt: off
 COMPILE_MATRIX = [
-    ('macos-1015', 'clang', None, ['cyrus']),
+    ('macos-1100', 'clang', None, ['cyrus']),
 ]
 
 # TODO (CDRIVER-3789): test cse with the 'sharded' topology.
 TEST_MATRIX = [
-    ('macos-1015', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0']),
+    ('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0']),
 
     # Test 6.0+ with a replica set since Queryable Encryption does not support the 'server' topology.
-    ('macos-1015', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
+    ('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['6.0', 'latest']),
 ]
 # fmt: on
 # pylint: enable=line-too-long
@@ -56,10 +56,6 @@ def tasks():
 
     res += generate_test_tasks(SSL, TAG, TEST_MATRIX)
 
-    # TODO: remove once MONGOCRYPT-443 is resolved.
-    for task in res:
-        task.disable = True
-
     return res
 
 

.evergreen/config_generator/components/funcs/run_mock_kms_servers.py

@@ -16,7 +16,6 @@ class RunMockKMSServers(Function):
         bash_exec(
             command_type=command_type,
             working_dir='drivers-evergreen-tools/.evergreen/csfle',
-            add_expansions_to_env=True,
             script='''\
                 set -o errexit
                 echo "Preparing KMS TLS venv environment..."

.evergreen/config_generator/components/sasl/darwinssl.py

@@ -16,11 +16,13 @@
 # fmt: off
 COMPILE_MATRIX = [
     ('macos-1014',       'clang', None, ['cyrus']),
+    ('macos-1015',       'clang', None, ['cyrus']),
+    ('macos-1100',       'clang', None, ['cyrus']),
     ('macos-1100-arm64', 'clang', None, ['cyrus']),
 ]
 
 TEST_MATRIX = [
-    ('macos-1014', 'clang', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', 'latest']),
+    ('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server'], ['3.6', '4.0', '4.2', '4.4', '5.0', 'latest']),
 ]
 # fmt: on
 # pylint: enable=line-too-long
@@ -51,6 +53,11 @@ def tasks():
     res += generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX)
     res += generate_test_tasks(SSL, TAG, TEST_MATRIX)
 
+    # TODO: remove once MONGOCRYPT-443 is resolved.
+    for task in res:
+        if task.run_on == 'macos-1015':
+            task.disable = True
+
     return res
 
 

.evergreen/config_generator/components/scan_build.py

@@ -17,7 +17,7 @@
 # pylint: disable=line-too-long
 # fmt: off
 MATRIX = [
-    ('macos-1014',       'clang', None  ),
+    ('macos-1100',       'clang', None  ),
     ('ubuntu1404',       'clang', None  ),
     ('ubuntu1604-arm64', 'clang', None  ),
     ('ubuntu1604',       'clang', 'i686'),

.evergreen/generated_configs/functions.yml

@@ -280,7 +280,6 @@ functions:
       params:
         binary: bash
         working_dir: drivers-evergreen-tools/.evergreen/csfle
-        add_expansions_to_env: true
         args:
           - -c
           - |

.evergreen/generated_configs/legacy-config.yml

@@ -9467,7 +9467,7 @@ buildvariants:
     CC: clang
   run_on: macos-1014
   tasks:
-  - .compression !.snappy !.zstd
+  - .compression !.snappy
   - release-compile
   - debug-compile-nosasl-nossl
   - debug-compile-rdtscp