Skip to content

chore(vhdbuilder): build ACL VHDs using marketplace images#8469

Merged
aadhar-agarwal merged 1 commit into
mainfrom
aadagarwal/marketplace-acl
May 11, 2026
Merged

chore(vhdbuilder): build ACL VHDs using marketplace images#8469
aadhar-agarwal merged 1 commit into
mainfrom
aadagarwal/marketplace-acl

Conversation

@aadhar-agarwal
Copy link
Copy Markdown
Contributor

@aadhar-agarwal aadhar-agarwal commented May 7, 2026

What this PR does / why we need it:

Switch ACL VHD builds from a direct-shared SIG source to the public Azure Linux 3 marketplace images:

  • x64: MicrosoftCBLMariner/azure-linux-3/azure-linux-3-acl

  • arm64: MicrosoftCBLMariner/azure-linux-3/azure-linux-3-arm64-gen2-acl

  • Pipelines: replace SIG_SOURCE_* vars with IMG_PUBLISHER/OFFER/SKU/VERSION in release and PR builders.

  • Packer: vhd-image-builder-acl{,-arm64}.json use image_publisher/offer/sku/version instead of shared_image_gallery.direct_shared_gallery_image_id.

  • ensure_sig_image_name_linux: skip the AzureLinux prefix when OS_SKU=AzureContainerLinux (ACL shares the azure-linux-3 offer but its destination SIG defs aclgen2TL/aclgen2arm64TL are unprefixed). Adds ShellSpec coverage + regression guard.

[TEST All VHDs] AKS Linux VHD Build - Msft Tenant - succeeded

E2Ev2 AKS RP Customized Image Validation - succeeded

Which issue(s) this PR fixes:

Fixes #

Copilot AI review requested due to automatic review settings May 7, 2026 21:34
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the ACL (AzureContainerLinux) VHD build to use Azure Marketplace images as the source image (publisher/offer/sku/version) instead of sourcing from a Shared Image Gallery, and adjusts SIG image naming logic so ACL outputs keep their intended (no-prefix) SIG image definition names.

Changes:

  • Switch ACL and ACL ARM64 Packer templates from Shared Image Gallery source image IDs to Marketplace image fields.
  • Update ensure_sig_image_name_linux to avoid adding the AzureLinux prefix for OS_SKU=AzureContainerLinux when IMG_OFFER=azure-linux-3.
  • Add ShellSpec coverage to guard the ACL naming behavior, and update build/release pipelines to set the required IMG_* variables.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.

Show a summary per file
File Description
vhdbuilder/packer/vhd-image-builder-acl.json Use Marketplace image (publisher/offer/sku/version) as the ACL build source instead of SIG direct image ID.
vhdbuilder/packer/vhd-image-builder-acl-arm64.json Same Marketplace-source change for ACL ARM64 builds.
vhdbuilder/packer/produce-packer-settings-functions.sh Prevent AzureLinux prefixing for ACL SIG image definition names despite sharing the azure-linux-3 offer.
spec/vhdbuilder/packer/ensure_sig_image_name_linux_spec.sh Add tests covering ACL naming behavior under IMG_OFFER=azure-linux-3.
.pipelines/.vsts-vhd-builder.yaml Set IMG_PUBLISHER/IMG_OFFER/IMG_SKU/IMG_VERSION for ACL build jobs; remove SIG source-image vars.
.pipelines/.vsts-vhd-builder-release.yaml Same pipeline variable updates for release builds.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

echo '##vso[task.setvariable variable=IMG_PUBLISHER]MicrosoftCBLMariner'
echo '##vso[task.setvariable variable=IMG_OFFER]azure-linux-3'
echo '##vso[task.setvariable variable=IMG_SKU]azure-linux-3-acl'
echo '##vso[task.setvariable variable=IMG_VERSION]3.20260506.01'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when will that be updated ? normally we use latest, will the ACL team be on top of this ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we will actively be updating this. We do want to switch to using latest soon as well - Given the product is going to GA soon, we want to be in control of the first few versions and make sure it is smooth initially.

Signed-off-by: Aadhar Agarwal <aadagarwal@microsoft.com>
@aadhar-agarwal aadhar-agarwal force-pushed the aadagarwal/marketplace-acl branch from 1489d6b to 43a827f Compare May 11, 2026 04:44
@aadhar-agarwal aadhar-agarwal merged commit f3beaff into main May 11, 2026
37 checks passed
@aadhar-agarwal aadhar-agarwal deleted the aadagarwal/marketplace-acl branch May 11, 2026 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants