Remove all usage of Windows 2012.

PiperOrigin-RevId: 574310067

CHANGES.md

@@ -50,7 +50,7 @@
         [the microsoft documentation](https://docs.microsoft.com/en-us/windows-server/administration/server-core/what-is-server-core)
         for more information on the differences.
 -   Remove deprecated versionless `windows` os_type.
-    -   You will have to specify `windows2012_core`.
+    -   You will have to specify `windows2016_core`.
 -   Removed deprecated versionless `rhel` os_type.
     -   You will have to specify `rhel7` on most providers or `amazonlinux1` on
         AWS.
@@ -308,7 +308,7 @@ New features:
 - Added Horovod distributed Tensorflow traning benchmark.
 - Added support for capacity reservations for VMs and added AWS implementation.
 - Added support for adding additional flags to mount and /etc/fstab.
-- Added support for Windows2012, 2016, and 2019 for AWS, Azure, and GCP.
+- Added support for Windows 2016, 2019 and 2022 for AWS, Azure, and GCP.
 - Terasort implementation on dpb backend.
 - Added cluster boot benchmark implementation on dpb backend.
 - Support multiple redis versions in cloud redis.

CHANGES.next.md

@@ -401,3 +401,4 @@
 -   Remove cygwin codepath.
 -   Moved flags from `pkb.py` to `flags.py` to help avoid circular dependencies.
 -   Updated tracer dstat to use pcp dstat.
+-   Removed Windows 2012 after loss of support on all clouds.

perfkitbenchmarker/os_types.py

@@ -55,11 +55,9 @@
 UBUNTU2004_EFA = 'ubuntu2004_efa'
 UBUNTU2204 = 'ubuntu2204'
 UBUNTU2304 = 'ubuntu2304'
-WINDOWS2012_CORE = 'windows2012_core'
 WINDOWS2016_CORE = 'windows2016_core'
 WINDOWS2019_CORE = 'windows2019_core'
 WINDOWS2022_CORE = 'windows2022_core'
-WINDOWS2012_DESKTOP = 'windows2012_desktop'
 WINDOWS2016_DESKTOP = 'windows2016_desktop'
 WINDOWS2019_DESKTOP = 'windows2019_desktop'
 WINDOWS2022_DESKTOP = 'windows2022_desktop'
@@ -128,14 +126,12 @@
 ]
 
 WINDOWS_CORE_OS_TYPES = [
-    WINDOWS2012_CORE,
     WINDOWS2016_CORE,
     WINDOWS2019_CORE,
     WINDOWS2022_CORE,
 ]
 
 WINDOWS_DESKOP_OS_TYPES = [
-    WINDOWS2012_DESKTOP,
     WINDOWS2016_DESKTOP,
     WINDOWS2019_DESKTOP,
     WINDOWS2022_DESKTOP,

perfkitbenchmarker/providers/aws/aws_virtual_machine.py

@@ -1947,11 +1947,6 @@ def _DiskDriveIsLocal(self, device, model):
     return True
 
 
-class Windows2012CoreAwsVirtualMachine(
-    BaseWindowsAwsVirtualMachine, windows_virtual_machine.Windows2012CoreMixin):
-  IMAGE_SSM_PATTERN = '/aws/service/ami-windows-latest/Windows_Server-2012-R2_RTM-English-64Bit-Core'
-
-
 class Windows2016CoreAwsVirtualMachine(
     BaseWindowsAwsVirtualMachine, windows_virtual_machine.Windows2016CoreMixin):
   IMAGE_SSM_PATTERN = '/aws/service/ami-windows-latest/Windows_Server-2016-English-Core-Base'
@@ -1967,12 +1962,6 @@ class Windows2022CoreAwsVirtualMachine(
   IMAGE_SSM_PATTERN = '/aws/service/ami-windows-latest/Windows_Server-2022-English-Core-Base'
 
 
-class Windows2012DesktopAwsVirtualMachine(
-    BaseWindowsAwsVirtualMachine,
-    windows_virtual_machine.Windows2012DesktopMixin):
-  IMAGE_SSM_PATTERN = '/aws/service/ami-windows-latest/Windows_Server-2012-R2_RTM-English-64Bit-Base'
-
-
 class Windows2016DesktopAwsVirtualMachine(
     BaseWindowsAwsVirtualMachine,
     windows_virtual_machine.Windows2016DesktopMixin):

perfkitbenchmarker/providers/azure/azure_virtual_machine.py

@@ -1182,17 +1182,6 @@ def _DiskDriveIsLocal(self, device, model):
     return False
 
 
-# Azure seems to have dropped support for 2012 Server Core. It is neither here:
-# https://docs.microsoft.com/en-us/azure/virtual-machines/windows/cli-ps-findimage#table-of-commonly-used-windows-images
-# nor in `az vm image list -p MicrosoftWindowsServer -f WindowsServer -s 2012`
-# Rather than exclude this just allow 2012 to refer to the 2012 Base image.
-class Windows2012CoreAzureVirtualMachine(
-    BaseWindowsAzureVirtualMachine,
-    windows_virtual_machine.Windows2012CoreMixin):
-  GEN2_IMAGE_URN = 'MicrosoftWindowsServer:windowsserver-gen2preview:2012-r2-datacenter-gen2:latest'
-  IMAGE_URN = 'MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest'
-
-
 class Windows2016CoreAzureVirtualMachine(
     BaseWindowsAzureVirtualMachine,
     windows_virtual_machine.Windows2016CoreMixin):
@@ -1213,13 +1202,6 @@ class Windows2022CoreAzureVirtualMachine(
   IMAGE_URN = 'MicrosoftWindowsServer:WindowsServer:2022-Datacenter-Core:latest'
 
 
-class Windows2012DesktopAzureVirtualMachine(
-    BaseWindowsAzureVirtualMachine,
-    windows_virtual_machine.Windows2012DesktopMixin):
-  GEN2_IMAGE_URN = 'MicrosoftWindowsServer:windowsserver-gen2preview:2012-r2-datacenter-gen2:latest'
-  IMAGE_URN = 'MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest'
-
-
 class Windows2016DesktopAzureVirtualMachine(
     BaseWindowsAzureVirtualMachine,
     windows_virtual_machine.Windows2016DesktopMixin):

perfkitbenchmarker/providers/gcp/gce_windows_virtual_machine.py

@@ -65,20 +65,15 @@ class WindowsGceVirtualMachine(
   """Class supporting Windows GCE virtual machines."""
 
   DEFAULT_X86_IMAGE_FAMILY = {
-      os_types.WINDOWS2012_CORE: 'windows-2012-r2-core',
       os_types.WINDOWS2016_CORE: 'windows-2016-core',
       os_types.WINDOWS2019_CORE: 'windows-2019-core',
       os_types.WINDOWS2022_CORE: 'windows-2022-core',
-      os_types.WINDOWS2012_DESKTOP: 'windows-2012-r2',
       os_types.WINDOWS2016_DESKTOP: 'windows-2016',
       os_types.WINDOWS2019_DESKTOP: 'windows-2019',
       os_types.WINDOWS2022_DESKTOP: 'windows-2022',
   }
 
-  GVNIC_DISABLED_OS_TYPES = [
-      os_types.WINDOWS2012_CORE,
-      os_types.WINDOWS2012_DESKTOP,
-  ]
+  GVNIC_DISABLED_OS_TYPES = []
 
   NVME_START_INDEX = 0
   OS_TYPE = os_types.WINDOWS_CORE_OS_TYPES + os_types.WINDOWS_DESKOP_OS_TYPES

perfkitbenchmarker/providers/ibmcloud/ibmcloud_virtual_machine.py

@@ -479,12 +479,6 @@ def _PostCreate(self):
     logging.info('Password decrypted for %s, %s', self.fip_address, self.vmid)
 
 
-class Windows2012CoreIbmCloudVirtualMachine(
-    WindowsIbmCloudVirtualMachine,
-    windows_virtual_machine.Windows2012CoreMixin):
-  IMAGE_NAME_PREFIX = 'ibm-windows-server-2012-full'
-
-
 class Windows2016CoreIbmCloudVirtualMachine(
     WindowsIbmCloudVirtualMachine,
     windows_virtual_machine.Windows2016CoreMixin):

perfkitbenchmarker/windows_virtual_machine.py

@@ -732,11 +732,6 @@ def _IsSmtEnabled(self):
     raise NotImplementedError('SMT detection currently not implemented')
 
 
-class Windows2012CoreMixin(BaseWindowsMixin):
-  """Class holding Windows Server 2012 Server Core VM specifics."""
-  OS_TYPE = os_types.WINDOWS2012_CORE
-
-
 class Windows2016CoreMixin(BaseWindowsMixin):
   """Class holding Windows Server 2016 Server Core VM specifics."""
   OS_TYPE = os_types.WINDOWS2016_CORE
@@ -752,11 +747,6 @@ class Windows2022CoreMixin(BaseWindowsMixin):
   OS_TYPE = os_types.WINDOWS2022_CORE
 
 
-class Windows2012DesktopMixin(BaseWindowsMixin):
-  """Class holding Windows Server 2012 with Desktop Experience VM specifics."""
-  OS_TYPE = os_types.WINDOWS2012_DESKTOP
-
-
 class Windows2016DesktopMixin(BaseWindowsMixin):
   """Class holding Windows Server 2016 with Desktop Experience VM specifics."""
   OS_TYPE = os_types.WINDOWS2016_DESKTOP

tests/gce_windows_virtual_machine_test.py

@@ -52,8 +52,6 @@ def setUp(self):
   @parameterized.named_parameters(
       ('WINDOWS2022_DESKTOP', os_types.WINDOWS2022_DESKTOP, True,
        'windows-2022', 'windows-cloud'),
-      ('WINDOWS2012_CORE', os_types.WINDOWS2012_CORE, False,
-       'windows-2012-r2-core', 'windows-cloud'),
       ('WINDOWS2022_SQLSERVER_2019_ENTERPRISE',
        os_types.WINDOWS2022_SQLSERVER_2019_ENTERPRISE, True,
        'sql-ent-2019-win-2022', 'windows-sql-cloud'))