Added GCE SQL Server 2025 images to PKB

PiperOrigin-RevId: 847010068

Author: p3rf Team

perfkitbenchmarker/os_types.py

@@ -71,6 +71,12 @@
 WINDOWS2019_SQLSERVER_2019_ENTERPRISE = (
     'windows2019_desktop_sqlserver_2019_enterprise'
 )
+WINDOWS2019_SQLSERVER_2025_STANDARD = (
+    'windows2019_desktop_sqlserver_2025_standard'
+)
+WINDOWS2019_SQLSERVER_2025_ENTERPRISE = (
+    'windows2019_desktop_sqlserver_2025_enterprise'
+)
 WINDOWS2022_SQLSERVER_2019_STANDARD = (
     'windows2022_desktop_sqlserver_2019_standard'
 )
@@ -83,6 +89,12 @@
 WINDOWS2022_SQLSERVER_2022_ENTERPRISE = (
     'windows2022_desktop_sqlserver_2022_enterprise'
 )
+WINDOWS2022_SQLSERVER_2025_STANDARD = (
+    'windows2022_desktop_sqlserver_2025_standard'
+)
+WINDOWS2022_SQLSERVER_2025_ENTERPRISE = (
+    'windows2022_desktop_sqlserver_2025_enterprise'
+)
 WINDOWS2025_SQLSERVER_2019_STANDARD = (
     'windows2025_desktop_sqlserver_2019_standard'
 )
@@ -95,6 +107,12 @@
 WINDOWS2025_SQLSERVER_2022_ENTERPRISE = (
     'windows2025_desktop_sqlserver_2022_enterprise'
 )
+WINDOWS2025_SQLSERVER_2025_STANDARD = (
+    'windows2025_desktop_sqlserver_2025_standard'
+)
+WINDOWS2025_SQLSERVER_2025_ENTERPRISE = (
+    'windows2025_desktop_sqlserver_2025_enterprise'
+)
 
 # Base-only OS types
 DEBIAN = 'debian'
@@ -176,14 +194,20 @@
     WINDOWS2019_SQLSERVER_2017_ENTERPRISE,
     WINDOWS2019_SQLSERVER_2019_STANDARD,
     WINDOWS2019_SQLSERVER_2019_ENTERPRISE,
+    WINDOWS2019_SQLSERVER_2025_STANDARD,
+    WINDOWS2019_SQLSERVER_2025_ENTERPRISE,
     WINDOWS2022_SQLSERVER_2019_STANDARD,
     WINDOWS2022_SQLSERVER_2019_ENTERPRISE,
     WINDOWS2022_SQLSERVER_2022_STANDARD,
     WINDOWS2022_SQLSERVER_2022_ENTERPRISE,
+    WINDOWS2022_SQLSERVER_2025_STANDARD,
+    WINDOWS2022_SQLSERVER_2025_ENTERPRISE,
     WINDOWS2025_SQLSERVER_2019_STANDARD,
     WINDOWS2025_SQLSERVER_2019_ENTERPRISE,
     WINDOWS2025_SQLSERVER_2022_STANDARD,
     WINDOWS2025_SQLSERVER_2022_ENTERPRISE,
+    WINDOWS2025_SQLSERVER_2025_STANDARD,
+    WINDOWS2025_SQLSERVER_2025_ENTERPRISE,
 ]
 
 WINDOWS_OS_TYPES = (

perfkitbenchmarker/providers/gcp/gce_windows_virtual_machine.py

@@ -246,14 +246,20 @@ class WindowsGceSqlServerVirtualMachine(WindowsGceVirtualMachine):
       os_types.WINDOWS2019_SQLSERVER_2017_ENTERPRISE: 'sql-ent-2017-win-2019',
       os_types.WINDOWS2019_SQLSERVER_2019_STANDARD: 'sql-std-2019-win-2019',
       os_types.WINDOWS2019_SQLSERVER_2019_ENTERPRISE: 'sql-ent-2019-win-2019',
+      os_types.WINDOWS2019_SQLSERVER_2025_STANDARD: 'sql-std-2025-win-2019',
+      os_types.WINDOWS2019_SQLSERVER_2025_ENTERPRISE: 'sql-ent-2025-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_STANDARD: 'sql-std-2022-win-2022',
       os_types.WINDOWS2022_SQLSERVER_2022_ENTERPRISE: 'sql-ent-2022-win-2022',
+      os_types.WINDOWS2022_SQLSERVER_2025_STANDARD: 'sql-std-2025-win-2022',
+      os_types.WINDOWS2022_SQLSERVER_2025_ENTERPRISE: 'sql-ent-2025-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_types.WINDOWS2025_SQLSERVER_2025_STANDARD: 'sql-std-2025-win-2025',
+      os_types.WINDOWS2025_SQLSERVER_2025_ENTERPRISE: 'sql-ent-2025-win-2025',
   }
 
   OS_TYPE = os_types.WINDOWS_SQLSERVER_OS_TYPES

perfkitbenchmarker/sqlserver_iaas_relational_db.py

@@ -141,7 +141,7 @@ def MoveSQLServerTempDb(
 
       if self.TEMPDB_DISK_LETTER in drive_list:
         stdout, _ = vm.RemoteCommand(
-            'sqlcmd -h -1 -Q "SET NOCOUNT '
+            'sqlcmd -C -h -1 -Q "SET NOCOUNT '
             " ON; select f.name + CASE WHEN "
             "f.type = 1 THEN '.ldf' "
             "ELSE '.mdf' END "
@@ -161,7 +161,7 @@ def MoveSQLServerTempDb(
         for tmp_db_file in tmp_db_files_list:
           tmp_db_name = tmp_db_file.split(".")[0]
           vm.RemoteCommand(
-              'sqlcmd -Q "ALTER DATABASE tempdb '
+              'sqlcmd -C -Q "ALTER DATABASE tempdb '
               "MODIFY FILE (NAME = [{}], "
               "FILENAME = '{}:\\TEMPDB\\{}');\" -U {} -P {}".format(
                   tmp_db_name, tempdb_disk, tmp_db_file,
@@ -227,7 +227,7 @@ def MoveLogAndTempDbFiles(self):
 
     # Sets the default log database to the new log disk
     self.server_vm.RemoteCommand(
-        f"sqlcmd -U {self.spec.database_username} "
+        f"sqlcmd -C -U {self.spec.database_username} "
         f'-P {self.spec.database_password} -Q "EXEC xp_instance_regwrite'
         " N'HKEY_LOCAL_MACHINE',"
         " N'Software\\Microsoft\\MSSQLServer\\MSSQLServer', N'DefaultLog',"
@@ -545,7 +545,7 @@ def EnsurePrimaryReplica(self):
     """Move server_vm as primary node in AOAG."""
     # Set first server vm as primary if necessary
     out, _ = self.server_vm.RemoteCommand(
-        """sqlcmd -Q \"
+        """sqlcmd -C -Q \"
         SELECT
           role_desc
         FROM
@@ -557,7 +557,7 @@ def EnsurePrimaryReplica(self):
         """.format(sql_engine_utils.SQLSERVER_AOAG_NAME))
     if "PRIMARY" not in out:
       self.server_vm.RemoteCommand(
-          'sqlcmd -Q "ALTER AVAILABILITY GROUP [{}] FAILOVER"'.format(
+          'sqlcmd -C -Q "ALTER AVAILABILITY GROUP [{}] FAILOVER"'.format(
               sql_engine_utils.SQLSERVER_AOAG_NAME))
 
   def ConfigureSQLServerHaAoag(self):
@@ -644,7 +644,7 @@ def ConfigureSQLServerHaAoag(self):
         r"mkdir F:\DATA; mkdir F:\Logs; mkdir F:\Backup")
     self.PushAndRunPowershellScript(
         server_vm, "check_sql_server_status.ps1")
-    server_vm.RemoteCommand("""sqlcmd -Q \"
+    server_vm.RemoteCommand("""sqlcmd -C -Q \"
         USE [master]
         GO
         ALTER LOGIN [sa] ENABLE
@@ -690,7 +690,7 @@ def ConfigureSQLServerHaAoag(self):
     # failed to for user 'NT AUTHORITY\ANONYMOUS LOGON double
     self.PushAndRunPowershellScript(server_vm, "check_sql_server_status.ps1")
     server_vm.RemoteCommand(
-        """sqlcmd -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
+        """sqlcmd -C -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
         USE [master]
         GO
 
@@ -727,7 +727,7 @@ def ConfigureSQLServerHaAoag(self):
     self.PushAndRunPowershellScript(
         replica_vms[0], "check_sql_server_status.ps1")
     replica_vms[0].RemoteCommand(
-        """sqlcmd -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
+        """sqlcmd -C -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
         USE [master]
         GO
 
@@ -766,7 +766,7 @@ def ConfigureSQLServerHaAoag(self):
         )
     self.PushAndRunPowershellScript(server_vm, "check_sql_server_status.ps1")
     server_vm.RemoteCommand(
-        """sqlcmd -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
+        """sqlcmd -C -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
         USE [master]
         GO
 
@@ -788,7 +788,7 @@ def ConfigureSQLServerHaAoag(self):
     self.PushAndRunPowershellScript(
         replica_vms[0], "check_sql_server_status.ps1")
     replica_vms[0].RemoteCommand(
-        """sqlcmd -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
+        """sqlcmd -C -Q \"--- YOU MUST EXECUTE THE FOLLOWING SCRIPT IN SQLCMD MODE.
         ALTER AVAILABILITY GROUP [{0}] JOIN;
         GO
 
@@ -809,7 +809,7 @@ def ConfigureSQLServerHaAoag(self):
 
     self.PushAndRunPowershellScript(server_vm, "check_sql_server_status.ps1")
     server_vm.RemoteCommand(
-        """sqlcmd -Q \"
+        """sqlcmd -C -Q \"
         ALTER AVAILABILITY GROUP [{1}] REMOVE DATABASE [{0}];
         DROP DATABASE [{0}];\"
         """.format(sql_engine_utils.SQLSERVER_AOAG_DB_NAME,
@@ -892,28 +892,28 @@ def GetSQLServerVersion(
 
 def ConfigureSQLServer(vm, username: str, password: str):
   """Update the username and password on a SQL Server."""
-  vm.RemoteCommand(f'sqlcmd -Q "ALTER LOGIN {username} ENABLE;"')
+  vm.RemoteCommand(f'sqlcmd -C -Q "ALTER LOGIN {username} ENABLE;"')
   vm.RemoteCommand(
-      f"sqlcmd -Q \"ALTER LOGIN sa WITH PASSWORD = '{password}' ;\""
+      f"sqlcmd -C -Q \"ALTER LOGIN sa WITH PASSWORD = '{password}' ;\""
   )
   vm.RemoteCommand(
-      "sqlcmd -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
+      "sqlcmd -C -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
       "N'Software\\Microsoft\\MSSQLServer\\MSSQLServer', "
       "N'LoginMode', REG_DWORD, 2\""
   )
   vm.RemoteCommand(
-      "sqlcmd -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
+      "sqlcmd -C -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
       "N'Software\\Microsoft\\MSSQLServer\\MSSQLServer', "
       "N'BackupDirectory', REG_SZ, N'C:\\scratch'\""
   )
 
   vm.RemoteCommand(
-      "sqlcmd -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
+      "sqlcmd -C -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
       "N'Software\\Microsoft\\MSSQLServer\\MSSQLServer', "
       f"N'DefaultData', REG_SZ, N'{vm.assigned_disk_letter}:\\'\""
   )
   vm.RemoteCommand(
-      "sqlcmd -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
+      "sqlcmd -C -Q \"EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', "
       "N'Software\\Microsoft\\MSSQLServer\\MSSQLServer', "
       f"N'DefaultLog', REG_SZ, N'{vm.assigned_disk_letter}:\\'\""
   )

perfkitbenchmarker/windows_virtual_machine.py

@@ -792,6 +792,18 @@ class Windows2019SQLServer2019Enterprise(BaseWindowsMixin):
   OS_TYPE = os_types.WINDOWS2019_SQLSERVER_2019_ENTERPRISE
 
 
+class Windows2019SQLServer2025Standard(BaseWindowsMixin):
+  """Class holding Windows Server 2019 with Desktop Experience VM specifics."""
+
+  OS_TYPE = os_types.WINDOWS2019_SQLSERVER_2025_STANDARD
+
+
+class Windows2019SQLServer2025Enterprise(BaseWindowsMixin):
+  """Class holding Windows Server 2019 with Desktop Experience VM specifics."""
+
+  OS_TYPE = os_types.WINDOWS2019_SQLSERVER_2025_ENTERPRISE
+
+
 class Windows2022SQLServer2019Standard(BaseWindowsMixin):
   """Class holding Windows Server 2022 with Desktop Experience VM specifics."""
 
@@ -816,13 +828,37 @@ class Windows2022SQLServer2022Enterprise(BaseWindowsMixin):
   OS_TYPE = os_types.WINDOWS2022_SQLSERVER_2022_ENTERPRISE
 
 
-class Windows2025SQLServer2022Standard(BaseWindowsMixin):
+class Windows2022SQLServer2025Standard(BaseWindowsMixin):
   """Class holding Windows Server 2022 with Desktop Experience VM specifics."""
 
+  OS_TYPE = os_types.WINDOWS2022_SQLSERVER_2025_STANDARD
+
+
+class Windows2022SQLServer2025Enterprise(BaseWindowsMixin):
+  """Class holding Windows Server 2022 with Desktop Experience VM specifics."""
+
+  OS_TYPE = os_types.WINDOWS2022_SQLSERVER_2025_ENTERPRISE
+
+
+class Windows2025SQLServer2022Standard(BaseWindowsMixin):
+  """Class holding Windows Server 2025 with Desktop Experience VM specifics."""
+
   OS_TYPE = os_types.WINDOWS2025_SQLSERVER_2022_STANDARD
 
 
 class Windows2025SQLServer2022Enterprise(BaseWindowsMixin):
-  """Class holding Windows Server 2022 with Desktop Experience VM specifics."""
+  """Class holding Windows Server 2025 with Desktop Experience VM specifics."""
 
   OS_TYPE = os_types.WINDOWS2025_SQLSERVER_2022_ENTERPRISE
+
+
+class Windows2025SQLServer2025Standard(BaseWindowsMixin):
+  """Class holding Windows Server 2025 with Desktop Experience VM specifics."""
+
+  OS_TYPE = os_types.WINDOWS2025_SQLSERVER_2025_STANDARD
+
+
+class Windows2025SQLServer2025Enterprise(BaseWindowsMixin):
+  """Class holding Windows Server 2025 with Desktop Experience VM specifics."""
+
+  OS_TYPE = os_types.WINDOWS2025_SQLSERVER_2025_ENTERPRISE

tests/iaas_relational_db_test.py

@@ -438,7 +438,7 @@ def testMoveLogAndTempDbFiles(self):
               '{ New-Item -Path $Path -ItemType Directory }'
           ),
           mock.call(
-              "sqlcmd -U sa -P password -Q \"EXEC xp_instance_regwrite"
+              "sqlcmd -C -U sa -P password -Q \"EXEC xp_instance_regwrite"
               " N'HKEY_LOCAL_MACHINE', "
               "N'Software\\Microsoft\\MSSQLServer\\MSSQLServer', N'DefaultLog',"
               " REG_SZ, N'Y:\\MSSQL\\LOGDB'\""