chore: change windows build vm size to match linux (#5812)

Azure · Feb 12, 2025 · 0d34607 · 0d34607
1 parent 73a5368
commit 0d34607
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/.pipelines/.vsts-vhd-builder-pr-windows.yaml b/.pipelines/.vsts-vhd-builder-pr-windows.yaml
@@ -49,6 +49,7 @@ stages:
     parameters:
       vhddebug: False
       dryrun: False
+      buildVmSize: Standard_D4ds_v5
       build2019containerd: True
       build2022containerd: False
       build2022containerdgen2: True

diff --git a/.pipelines/.vsts-vhd-builder-release-windows.yaml b/.pipelines/.vsts-vhd-builder-release-windows.yaml
@@ -43,6 +43,10 @@ parameters:
   displayName: Skip Extension Check
   type: boolean
   default: False
+- name: buildVmSize
+  displayName: Build VM Size
+  type: string
+  default: Standard_D4ds_v5
 
 # Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build"
 # Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build - PR check-in gate"
@@ -53,6 +57,7 @@ stages:
     parameters:
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      buildVmSize: ${{ parameters.buildVmSize }}
       build2019containerd: ${{ parameters.build2019containerd }}
       build2022containerd:  ${{ parameters.build2022containerd }}
       build2022containerdgen2:  ${{ parameters.build2022containerdgen2 }}

diff --git a/.pipelines/templates/.build-and-test-windows-vhd-template.yaml b/.pipelines/templates/.build-and-test-windows-vhd-template.yaml
@@ -25,7 +25,6 @@ parameters:
     default: True
   - name: buildVmSize
     type: string
-    default: Standard_D4s_v3
     displayName: VM SKU to build the VHD with. Has a sensible default
   - name: hyperVGeneration
     type: string

diff --git a/.pipelines/templates/.build-and-test-windows-vhds-template.yaml b/.pipelines/templates/.build-and-test-windows-vhds-template.yaml
@@ -26,6 +26,9 @@ parameters:
     displayName: Skip Extension Check
     type: boolean
     default: False
+  - name: buildVmSize
+    displayName: Build VM Size
+    type: string
 
 stages:
   - template:   ./.build-and-test-windows-vhd-template.yaml
@@ -38,6 +41,7 @@ stages:
       build: ${{ parameters.build2019containerd }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      buildVmSize: ${{ parameters.buildVmSize }}
       skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
       windowsBaseImageUrl: $(WINDOWS_2019_BASE_IMAGE_URL)
       windowsNanoImageUrl: $(WINDOWS_2019_NANO_IMAGE_URL)
@@ -53,6 +57,7 @@ stages:
       build: ${{ parameters.build2022containerd }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      buildVmSize: ${{ parameters.buildVmSize }}
       skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
       windowsBaseImageUrl: $(WINDOWS_2022_BASE_IMAGE_URL)
       windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
@@ -65,6 +70,7 @@ stages:
       imageName: windows-2022-containerd-gen2
       windowsSku: 2022-containerd-gen2
       hyperVGeneration: V2
+      buildVmSize: ${{ parameters.buildVmSize }}
       build: ${{ parameters.build2022containerdgen2 }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
@@ -80,6 +86,7 @@ stages:
       imageName: windows-23H2
       windowsSku: 23H2
       hyperVGeneration: V1
+      buildVmSize: ${{ parameters.buildVmSize }}
       build: ${{ parameters.build23H2 }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
@@ -95,6 +102,7 @@ stages:
       imageName: windows-23H2-gen2
       windowsSku: 23H2-gen2
       hyperVGeneration: V2
+      buildVmSize: ${{ parameters.buildVmSize }}
       build: ${{ parameters.build23H2gen2 }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}