Migrate server 8.0+ tasks to windows-2022-latest

.evergreen/config_generator/components/cse/openssl.py

@@ -14,10 +14,11 @@
 # fmt: off
 COMPILE_MATRIX = [
     # For test matrix.
-    ('rhel8-latest',       'gcc',       None, ['cyrus']),
-    ('rhel8-arm64-latest', 'gcc',       None, ['cyrus']),
-    ('rhel8-zseries',      'gcc',       None, ['cyrus']), # Big Endian.
-    ('windows-vsCurrent',  'vs2022x64', None, ['cyrus']),
+    ('rhel8-latest',        'gcc',       None, ['cyrus']),
+    ('rhel8-arm64-latest',  'gcc',       None, ['cyrus']),
+    ('rhel8-zseries',       'gcc',       None, ['cyrus']), # Big Endian.
+    ('windows-vsCurrent',   'vs2022x64', None, ['sspi' ]),
+    ('windows-2022-latest', 'vs2022x64', None, ['sspi' ]),
 
     # For compile only.
     ('debian11-latest', 'clang',    None, ['cyrus']),
@@ -41,7 +42,8 @@
     # rhel8-zseries only provides 5.0+. Resource-limited: use sparingly.
     ('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['sharded'], ['5.0', 'latest']),
 
-    ('windows-vsCurrent', 'vs2022x64', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
+    ('windows-vsCurrent',   'vs2022x64', None, 'sspi', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0',                ]),
+    ('windows-2022-latest', 'vs2022x64', None, 'sspi', ['auth'], ['server', 'replica', 'sharded'], [                                   '8.0', 'latest']),
 ]
 # fmt: on
 # pylint: enable=line-too-long
@@ -56,14 +58,21 @@ class SaslCyrusOpenSSLCompile(OpenSSLCompileCommon):
     commands = OpenSSLCompileCommon.compile_commands(sasl='CYRUS')
 
 
+class SaslSspiOpenSSLCompile(OpenSSLCompileCommon):
+    name = 'cse-sasl-sspi-openssl-compile'
+    commands = OpenSSLCompileCommon.compile_commands(sasl='SSPI')
+
+
 def functions():
     return merge_defns(
         SaslCyrusOpenSSLCompile.defn(),
+        SaslSspiOpenSSLCompile.defn(),
     )
 
 
 SASL_TO_FUNC = {
     'cyrus': SaslCyrusOpenSSLCompile,
+    'sspi': SaslSspiOpenSSLCompile,
 }
 
 MORE_TAGS = ['cse']

.evergreen/config_generator/components/cse/winssl.py

@@ -12,12 +12,14 @@
 # pylint: disable=line-too-long
 # fmt: off
 COMPILE_MATRIX = [
-    ('windows-vsCurrent', 'vs2022x64', None, ['cyrus']),
+    ('windows-vsCurrent',   'vs2022x64', None, ['sspi']),
+    ('windows-2022-latest', 'vs2022x64', None, ['sspi']),
 ]
 
 # QE (subset of CSFLE) requires 7.0+ and are skipped by "server" tasks.
 TEST_MATRIX = [
-    ('windows-vsCurrent', 'vs2022x64', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
+    ('windows-vsCurrent',   'vs2022x64', None, 'sspi', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0',                ]),
+    ('windows-2022-latest', 'vs2022x64', None, 'sspi', ['auth'], ['server', 'replica', 'sharded'], [                                   '8.0', 'latest']),
 ]
 # fmt: on
 # pylint: enable=line-too-long
@@ -27,20 +29,20 @@ class WinSSLCompileCommon(CompileCommon):
     ssl = 'WINDOWS'
 
 
-class SaslCyrusWinSSLCompile(WinSSLCompileCommon):
-    name = 'cse-sasl-cyrus-winssl-compile'
-    commands = WinSSLCompileCommon.compile_commands(sasl='CYRUS')
+class SaslSspiWinSSLCompile(WinSSLCompileCommon):
+    name = 'cse-sasl-sspi-winssl-compile'
+    commands = WinSSLCompileCommon.compile_commands(sasl='SSPI')
 
 
 def functions():
-    return SaslCyrusWinSSLCompile.defn()
+    return SaslSspiWinSSLCompile.defn()
 
 
 def tasks():
     res = []
 
     SASL_TO_FUNC = {
-        'cyrus': SaslCyrusWinSSLCompile,
+        'sspi': SaslSspiWinSSLCompile,
     }
 
     MORE_TAGS = ['cse']

.evergreen/config_generator/components/sasl/openssl.py

@@ -15,20 +15,23 @@
 COMPILE_MATRIX = [
     # For test matrix.
     ('amazon2023-arm64-latest-large-m8g', 'gcc', None, ['cyrus']),
-    ('rhel8-latest',       'gcc',        None, ['cyrus']),
-    ('rhel8-arm64-latest', 'gcc',        None, ['cyrus']),
-    ('rhel8-power',        'gcc',        None, ['cyrus']),
-    ('rhel8-zseries',      'gcc',        None, ['cyrus']),
-    ('windows-vsCurrent',  'vs2017x64',  None, ['cyrus']),
+    ('rhel8-latest',        'gcc',               None, ['cyrus']),
+    ('rhel8-arm64-latest',  'gcc',               None, ['cyrus']),
+    ('rhel8-power',         'gcc',               None, ['cyrus']),
+    ('rhel8-zseries',       'gcc',               None, ['cyrus']),
+    ('windows-2022-latest', 'vs2022x64',         None, ['sspi' ]),
 
     # For compile only.
-    ('debian11-latest', 'gcc',      None, ['cyrus']),
-    ('debian12-latest', 'gcc',      None, ['cyrus']),
-    ('rhel80',          'gcc',      None, ['cyrus']),
-    ('ubuntu2204',      'gcc',      None, ['cyrus']),
-    ('ubuntu2204',      'clang-12', None, ['cyrus']),
-    ('ubuntu2404',      'gcc',      None, ['cyrus']),
-    ('ubuntu2404',      'clang-14', None, ['cyrus']),
+    ('debian11-latest',   'gcc',        None, ['cyrus']),
+    ('debian12-latest',   'gcc',        None, ['cyrus']),
+    ('rhel80',            'gcc',        None, ['cyrus']),
+    ('ubuntu2204',        'gcc',        None, ['cyrus']),
+    ('ubuntu2204',        'clang-12',   None, ['cyrus']),
+    ('ubuntu2404',        'gcc',        None, ['cyrus']),
+    ('ubuntu2404',        'clang-14',   None, ['cyrus']),
+    ('windows-vsCurrent', 'vs2017x64',  None, ['sspi' ]),
+    ('windows-vsCurrent', 'vs2019x64',  None, ['sspi' ]),
+    ('windows-vsCurrent', 'vs2022x64',  None, ['sspi' ]),
 ]
 
 TEST_MATRIX = [
@@ -37,7 +40,7 @@
     ('rhel8-power',        'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
     ('rhel8-zseries',      'gcc', None, 'cyrus', ['auth'], ['server'], [              '5.0', '6.0', '7.0', '8.0', 'latest']),
 
-    ('windows-vsCurrent',  'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['latest']),
+    ('windows-2022-latest',  'vs2022x64', None, 'sspi', ['auth'], ['server'], ['latest']),
 
     # Test with Graviton processor:
     ('amazon2023-arm64-latest-large-m8g', 'gcc',  None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['latest']),
@@ -55,14 +58,21 @@ class SaslCyrusOpenSSLCompile(OpenSSLCompileCommon):
     commands = OpenSSLCompileCommon.compile_commands(sasl='CYRUS')
 
 
+class SaslSspiOpenSSLCompile(OpenSSLCompileCommon):
+    name = 'sasl-sspi-openssl-compile'
+    commands = OpenSSLCompileCommon.compile_commands(sasl='SSPI')
+
+
 def functions():
     return merge_defns(
         SaslCyrusOpenSSLCompile.defn(),
+        SaslSspiOpenSSLCompile.defn(),
     )
 
 
 SASL_TO_FUNC = {
     'cyrus': SaslCyrusOpenSSLCompile,
+    'sspi': SaslSspiOpenSSLCompile,
 }
 
 TASKS = [

.evergreen/config_generator/components/sasl/winssl.py

@@ -14,21 +14,29 @@
 # fmt: off
 COMPILE_MATRIX = [
     # For test matrix.
-    ('windows-vsCurrent', 'mingw',     None, [       'sspi']),
-    ('windows-vsCurrent', 'vs2022x64', None, ['off', 'sspi']),
-    ('windows-vsCurrent', 'vs2022x86', None, ['off', 'sspi']),
+    ('windows-vsCurrent',   'mingw',     None, ['sspi']),
+    ('windows-vsCurrent',   'vs2022x64', None, ['sspi']),
+    ('windows-vsCurrent',   'vs2022x86', None, ['sspi']),
+    ('windows-2022-latest', 'mingw',     None, ['sspi']),
+    ('windows-2022-latest', 'vs2022x64', None, ['sspi']),
+    ('windows-2022-latest', 'vs2022x86', None, ['sspi']),
 
     # For compile only.
     ('windows-vsCurrent', 'vs2017x64', None, ['off', 'sspi']),
     ('windows-vsCurrent', 'vs2019x64', None, ['off', 'sspi']),
 ]
 
 TEST_MATRIX = [
-    ('windows-vsCurrent', 'vs2022x64', None, 'sspi', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
+    ('windows-vsCurrent',   'vs2022x64', None, 'sspi', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0',                ]),
+    ('windows-2022-latest', 'vs2022x64', None, 'sspi', ['auth'], ['server', 'replica', 'sharded'], [                                   '8.0', 'latest']),
 
-    # sharded + min + latest only.
-    ('windows-vsCurrent', 'mingw',     None, 'sspi',  ['auth'], ['sharded'], ['4.2', 'latest']),
-    ('windows-vsCurrent', 'vs2022x86', None, 'sspi',  ['auth'], ['sharded'], ['4.2', 'latest']),
+    # sharded + min only.
+    ('windows-vsCurrent',   'mingw',     None, 'sspi',  ['auth'], ['sharded'], ['4.2']),
+    ('windows-vsCurrent',   'vs2022x86', None, 'sspi',  ['auth'], ['sharded'], ['4.2']),
+
+    # sharded + latest only.
+    ('windows-2022-latest', 'mingw',     None, 'sspi',  ['auth'], ['sharded'], ['latest']),
+    ('windows-2022-latest', 'vs2022x86', None, 'sspi',  ['auth'], ['sharded'], ['latest']),
 ]
 # fmt: on
 # pylint: enable=line-too-long

.evergreen/config_generator/etc/distros.py

@@ -12,7 +12,6 @@ class Distro(BaseModel):
     * os: Name of the operating system.
     * os_type: One of Linux, MacOS, or Windows.
     * os_ver: Version of the operating system.
-    * vs_ver: Version of Visual Studio available.
     * size: Size of tasks the distro is designed to handle.
     * arch: Target architecture.
     """
@@ -21,15 +20,6 @@ class Distro(BaseModel):
     os: str | None = None
     os_type: Literal['linux', 'macos', 'windows'] | None = None
     os_ver: str | None = None
-    vs_ver: (
-        Literal[
-            '2017',
-            '2019',
-            '2022',
-            'vsCurrent',
-        ]
-        | None
-    ) = None
     size: Literal['small', 'large'] | None = None
     arch: Literal['arm64', 'power', 'zseries'] | None = None
 
@@ -95,7 +85,8 @@ def ls_distro(name, **kwargs):
 ]
 
 WINDOWS_DISTROS = [
-    *ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent'),  # Windows Server 2019
+    *ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', os_ver='2019'),  # Windows Server 2019
+    *ls_distro(name='windows-2022-latest', os='windows', os_type='windows', os_ver='2022'),  # Windows Server 2022
 ]
 
 GRAVITON_DISTROS = [

.evergreen/generated_configs/functions.yml

@@ -158,12 +158,29 @@ functions:
         args:
           - -c
           - EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON ${EXTRA_CONFIGURE_FLAGS}" .evergreen/scripts/compile.sh
-  cse-sasl-cyrus-winssl-compile:
+  cse-sasl-sspi-openssl-compile:
+    - command: expansions.update
+      params:
+        updates:
+          - { key: SSL, value: OPENSSL }
+          - { key: SASL, value: SSPI }
+    - command: subprocess.exec
+      type: test
+      params:
+        binary: bash
+        working_dir: mongoc
+        add_expansions_to_env: true
+        env:
+          COMPILE_LIBMONGOCRYPT: "ON"
+        args:
+          - -c
+          - EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON ${EXTRA_CONFIGURE_FLAGS}" .evergreen/scripts/compile.sh
+  cse-sasl-sspi-winssl-compile:
     - command: expansions.update
       params:
         updates:
           - { key: SSL, value: WINDOWS }
-          - { key: SASL, value: CYRUS }
+          - { key: SASL, value: SSPI }
     - command: subprocess.exec
       type: test
       params:
@@ -478,6 +495,19 @@ functions:
         args:
           - -c
           - .evergreen/scripts/compile.sh
+  sasl-sspi-openssl-compile:
+    - command: subprocess.exec
+      type: test
+      params:
+        binary: bash
+        working_dir: mongoc
+        add_expansions_to_env: true
+        env:
+          SASL: SSPI
+          SSL: OPENSSL
+        args:
+          - -c
+          - .evergreen/scripts/compile.sh
   sasl-sspi-winssl-compile:
     - command: subprocess.exec
       type: test