Merge branch 'master' into devinwon/move_components_json

Azure · Feb 12, 2025 · 61b5c8d · 61b5c8d
2 parents 0b2e95b + ed14820
commit 61b5c8d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/.pipelines/templates/.build-and-test-windows-vhd-template.yaml b/.pipelines/templates/.build-and-test-windows-vhd-template.yaml
@@ -30,6 +30,16 @@ parameters:
   - name: hyperVGeneration
     type: string
     displayName: V1 or V2.
+    default: False
+  - name: windowsBaseImageUrl
+    displayName: Windows Base Image URL Override
+    type: string
+  - name: windowsNanoImageUrl
+    displayName: Windows nano base container image URL Override
+    type: string
+  - name: windowsCoreImageUrl
+    displayName: Windows core base container image URL Override
+    type: string
 
 stages:
   - stage: build_${{ parameters.stageName }}
@@ -48,9 +58,9 @@ stages:
               echo '##vso[task.setvariable variable=HYPERV_GENERATION]${{ parameters.hyperVGeneration }}'
               echo '##vso[task.setvariable variable=AZURE_VM_SIZE]${{ parameters.buildVmSize }}'
               echo '##vso[task.setvariable variable=WINDOWS_SKU]${{ parameters.windowsSku }}'
-              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]$(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]$(WINDOWS_2022_NANO_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]$(WINDOWS_2022_CORE_IMAGE_URL)'
+              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]${{ parameters.windowsBaseImageUrl }}'
+              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]${{ parameters.windowsNanoImageUrl }}'
+              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]${{ parameters.windowsCoreImageUrl }}'
               echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
             displayName: Setup Build Variables
           - template: ./.builder-release-template-windows.yaml

diff --git a/.pipelines/templates/.build-and-test-windows-vhds-template.yaml b/.pipelines/templates/.build-and-test-windows-vhds-template.yaml
@@ -34,6 +34,9 @@ stages:
       build: ${{ parameters.build2019containerd }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      windowsBaseImageUrl: $(WINDOWS_2019_BASE_IMAGE_URL)
+      windowsNanoImageUrl: $(WINDOWS_2019_NANO_IMAGE_URL)
+      windowsCoreImageUrl: $(WINDOWS_2019_CORE_IMAGE_URL)
 
   - template:   ./.build-and-test-windows-vhd-template.yaml
     parameters:
@@ -45,6 +48,9 @@ stages:
       build: ${{ parameters.build2022containerd }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      windowsBaseImageUrl: $(WINDOWS_2022_BASE_IMAGE_URL)
+      windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
+      windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
 
   - template:   ./.build-and-test-windows-vhd-template.yaml
     parameters:
@@ -56,6 +62,9 @@ stages:
       build: ${{ parameters.build2022containerdgen2 }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
+      windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
+      windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
 
   - template:   ./.build-and-test-windows-vhd-template.yaml
     parameters:
@@ -67,6 +76,9 @@ stages:
       build: ${{ parameters.build23H2 }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      windowsBaseImageUrl: $(WINDOWS_23H2_BASE_IMAGE_URL)
+      windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
+      windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
 
   - template: ./.build-and-test-windows-vhd-template.yaml
     parameters:
@@ -78,6 +90,9 @@ stages:
       build: ${{ parameters.build23H2gen2 }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
+      windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
+      windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
+      windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
 
   - stage: backfill_cleanup_outdated_resources
     dependsOn: []