Revert "chore(windows): prevent windows 2019 vhds from building on pr and release (#7932)"

This reverts commit dda5453.

Author: janenotjung-hue

.github/workflows/validate-windows-binary-signature.yaml

@@ -11,6 +11,17 @@ on:
       - 'vhdbuilder/packer/windows/components_json_helpers.ps1'
 
 jobs:
+  check-files-for-ws2019:
+    name: Check for Windows 2019
+    runs-on: windows-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v6
+      - name: Run check script for 2019-containerd
+        shell: powershell
+        run: |
+          ./vhdbuilder/packer/test/windows-files-check.ps1 2019-containerd
+          
   check-files-for-ws2022:
     name: Check for Windows 2022
     runs-on: windows-latest

.pipelines/.vsts-Marketpalce-win.yaml

@@ -23,4 +23,3 @@ stages:
         - template: ./templates/.builder-Marketplace-win-template.yaml
           parameters:
             artifactName: 2019-containerd
-# Marketplace?

.pipelines/.vsts-vhd-builder-pr-windows.yaml

@@ -70,6 +70,8 @@ stages:
       useOverrides: False
       enableBackfillCleanup: True
       buildVmSize: Standard_D16ds_v5
+      # 2019 only supports gen1, so build that for PRs
+      build2019containerd: True
       # 2022 gen1 is the default, so build that for PRs
       build2022containerd: True
       build2022containerdgen2: False

.pipelines/.vsts-vhd-builder-release-windows.yaml

@@ -17,6 +17,10 @@ variables:
       value: ${{ variables.SKIP_EXTENSION_CHECK }}
 
 parameters:
+  - name: build2019containerd
+    displayName: Build 2019 containerd
+    type: boolean
+    default: True
   - name: build2022containerd
     displayName: Build 2022 containerd
     type: boolean
@@ -102,6 +106,7 @@ stages:
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
       buildVmSize: ${{ parameters.buildVmSize }}
+      build2019containerd: ${{ parameters.build2019containerd }}
       build2022containerd: ${{ parameters.build2022containerd }}
       build2022containerdgen2: ${{ parameters.build2022containerdgen2 }}
       build23H2: ${{ parameters.build23H2 }}

.pipelines/templates/.build-and-test-windows-vhds-template.yaml

@@ -1,4 +1,7 @@
 parameters:
+  - name: build2019containerd
+    displayName: Build 2019 containerd
+    type: boolean
   - name: build2022containerd
     displayName: Build 2022 containerd
     type: boolean
@@ -78,6 +81,29 @@ stages:
         inputs:
           artifactName: windows-cse-package
           targetPath: ${{ parameters.csePublishDir }}
+  - template: ./.build-and-test-windows-vhd-template.yaml
+    parameters:
+      stageName: win_2019_v1
+      artifactName: 2019-containerd
+      imageName: windows-2019-containerd
+      windowsSku: 2019-containerd
+      hyperVGeneration: V1
+      architecture: X86_64
+      build: ${{ parameters.build2019containerd }}
+      vhddebug: ${{ parameters.vhddebug }}
+      dryrun: ${{ parameters.dryrun }}
+      buildVmSize: ${{ parameters.buildVmSize }}
+      installOpenSshServer: ${{ parameters.installOpenSshServer }}
+      skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
+      windowsBaseImageUrl: $(WINDOWS_2019_BASE_IMAGE_URL)
+      windowsNanoImageUrl: $(WINDOWS_2019_NANO_IMAGE_URL)
+      windowsCoreImageUrl: $(WINDOWS_2019_CORE_IMAGE_URL)
+      windowsContainerImageJsonUrl: ${{ parameters.windowsContainerImageJsonUrl }}
+      overrideBranch: ${{ parameters.overrideBranch }}
+      useOverrides: ${{ parameters.useOverrides }}
+      csePackageDir: ${{ parameters.csePublishDir }}
+      cseFileName: ${{ parameters.cseFileName }}
+
   - template: ./.build-and-test-windows-vhd-template.yaml
     parameters:
       stageName: win_2022_v1

schemas/windows_settings.cue

@@ -31,6 +31,7 @@
 
 
 #WindowsBaseVersions: {
+  "2019-containerd": #WindowsBaseVersion
   "2022-containerd": #WindowsBaseVersion
   "2022-containerd-gen2": #WindowsBaseVersion
   "23H2": #WindowsBaseVersion
@@ -50,5 +51,5 @@
   WindowsRegistryKeys: #WindowsRegistryKeys
   WindowsBaseVersions: #WindowsBaseVersions
 }
-
-#WindowsSettings
+  
+#WindowsSettings

vhdbuilder/packer/windows/windows_settings.json

@@ -14,6 +14,13 @@
     "DefenderUpdateInfoUrl": "https://go.microsoft.com/fwlink/?linkid=870379&arch=x64&action=info"
   },
   "WindowsBaseVersions": {
+    "2019-containerd": {
+      "os_disk_size": "30",
+      "base_image_sku": "2019-Datacenter-Core-smalldisk",
+      "windows_image_name": "windows-2019-containerd",
+      "base_image_version": "17763.8389.260206",
+      "patches_to_apply": []
+    },
     "2022-containerd": {
       "os_disk_size": "35",
       "base_image_sku": "2022-Datacenter-Core-smalldisk",