Add PKB support for Windows Server 2025 for GCE

PiperOrigin-RevId: 706763277
GoogleCloudPlatform · Dec 16, 2024 · f22e67c · f22e67c
1 parent 60d6cbb
commit f22e67c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/perfkitbenchmarker/os_types.py b/perfkitbenchmarker/os_types.py
@@ -48,9 +48,11 @@
 WINDOWS2016_CORE = 'windows2016_core'
 WINDOWS2019_CORE = 'windows2019_core'
 WINDOWS2022_CORE = 'windows2022_core'
+WINDOWS2025_CORE = 'windows2025_core'
 WINDOWS2016_DESKTOP = 'windows2016_desktop'
 WINDOWS2019_DESKTOP = 'windows2019_desktop'
 WINDOWS2022_DESKTOP = 'windows2022_desktop'
+WINDOWS2025_DESKTOP = 'windows2025_desktop'
 WINDOWS2019_SQLSERVER_2017_STANDARD = (
     'windows2019_desktop_sqlserver_2017_standard'
 )
@@ -75,6 +77,18 @@
 WINDOWS2022_SQLSERVER_2022_ENTERPRISE = (
     'windows2022_desktop_sqlserver_2022_enterprise'
 )
+WINDOWS2025_SQLSERVER_2019_STANDARD = (
+    'windows2025_desktop_sqlserver_2019_standard'
+)
+WINDOWS2025_SQLSERVER_2019_ENTERPRISE = (
+    'windows2025_desktop_sqlserver_2019_enterprise'
+)
+WINDOWS2025_SQLSERVER_2022_STANDARD = (
+    'windows2025_desktop_sqlserver_2022_standard'
+)
+WINDOWS2025_SQLSERVER_2022_ENTERPRISE = (
+    'windows2025_desktop_sqlserver_2022_enterprise'
+)
 
 # Base-only OS types
 DEBIAN = 'debian'
@@ -125,12 +139,14 @@
     WINDOWS2016_CORE,
     WINDOWS2019_CORE,
     WINDOWS2022_CORE,
+    WINDOWS2025_CORE,
 ]
 
 WINDOWS_DESKOP_OS_TYPES = [
     WINDOWS2016_DESKTOP,
     WINDOWS2019_DESKTOP,
     WINDOWS2022_DESKTOP,
+    WINDOWS2025_DESKTOP
 ]
 
 WINDOWS_SQLSERVER_OS_TYPES = [
@@ -142,6 +158,10 @@
     WINDOWS2022_SQLSERVER_2019_ENTERPRISE,
     WINDOWS2022_SQLSERVER_2022_STANDARD,
     WINDOWS2022_SQLSERVER_2022_ENTERPRISE,
+    WINDOWS2025_SQLSERVER_2019_STANDARD,
+    WINDOWS2025_SQLSERVER_2019_ENTERPRISE,
+    WINDOWS2025_SQLSERVER_2022_STANDARD,
+    WINDOWS2025_SQLSERVER_2022_ENTERPRISE,
 ]
 
 CENTOS_TYPES = [CENTOS_STREAM9]

diff --git a/perfkitbenchmarker/providers/gcp/gce_windows_virtual_machine.py b/perfkitbenchmarker/providers/gcp/gce_windows_virtual_machine.py
@@ -68,9 +68,11 @@ class WindowsGceVirtualMachine(
       os_types.WINDOWS2016_CORE: 'windows-2016-core',
       os_types.WINDOWS2019_CORE: 'windows-2019-core',
       os_types.WINDOWS2022_CORE: 'windows-2022-core',
+      os_types.WINDOWS2025_CORE: 'windows-2025-core',
       os_types.WINDOWS2016_DESKTOP: 'windows-2016',
       os_types.WINDOWS2019_DESKTOP: 'windows-2019',
       os_types.WINDOWS2022_DESKTOP: 'windows-2022',
+      os_types.WINDOWS2025_DESKTOP: 'windows-2025',
   }
 
   GVNIC_DISABLED_OS_TYPES = []
@@ -272,8 +274,12 @@ class WindowsGceSqlServerVirtualMachine(WindowsGceVirtualMachine):
       os_types.WINDOWS2019_SQLSERVER_2019_ENTERPRISE: 'sql-ent-2019-win-2019',
       os_types.WINDOWS2022_SQLSERVER_2019_STANDARD: 'sql-std-2019-win-2022',
       os_types.WINDOWS2022_SQLSERVER_2019_ENTERPRISE: 'sql-ent-2019-win-2022',
-      os_types.WINDOWS2022_SQLSERVER_2022_ENTERPRISE: 'sql-ent-2022-win-2022',
       os_types.WINDOWS2022_SQLSERVER_2022_STANDARD: 'sql-std-2022-win-2022',
+      os_types.WINDOWS2022_SQLSERVER_2022_ENTERPRISE: 'sql-ent-2022-win-2022',
+      os_types.WINDOWS2025_SQLSERVER_2019_STANDARD: 'sql-std-2019-win-2025',
+      os_types.WINDOWS2025_SQLSERVER_2019_ENTERPRISE: 'sql-ent-2019-win-2025',
+      os_types.WINDOWS2025_SQLSERVER_2022_STANDARD: 'sql-std-2022-win-2025',
+      os_types.WINDOWS2025_SQLSERVER_2022_ENTERPRISE: 'sql-ent-2022-win-2025',
   }
 
   OS_TYPE = os_types.WINDOWS_SQLSERVER_OS_TYPES