Skip to content

fix(acl): switch base image source to ACG #9484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nishchay (awesomenix) merged 1 commit into from
Oct 5, 2026
Merged

fix(acl): switch base image source to ACG #9484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions .pipelines/.vsts-vhd-builder-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,10 +878,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-amd64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209152.2'
Comment thread
aadhar-agarwal marked this conversation as resolved.
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16ds_v5'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand All @@ -904,10 +903,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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.20260706.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-amd64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209152.2'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D4ads_v5'
echo '##vso[task.setvariable variable=CVM_TEST_VM_SIZE]Standard_DC8es_v6'
Expand All @@ -930,10 +928,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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-arm64-gen2-acl'
echo '##vso[task.setvariable variable=IMG_VERSION]3.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-arm64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209110.1'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16pds_v6'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand All @@ -956,10 +953,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-amd64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209152.2'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16ds_v5'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand All @@ -982,10 +978,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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-arm64-gen2-acl'
echo '##vso[task.setvariable variable=IMG_VERSION]3.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-arm64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209110.1'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16pds_v6'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand Down
28 changes: 12 additions & 16 deletions .pipelines/.vsts-vhd-builder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-amd64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209152.2'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16ds_v5'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand All @@ -268,10 +267,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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-arm64-gen2-acl'
echo '##vso[task.setvariable variable=IMG_VERSION]3.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-arm64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209110.1'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16pds_v6'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand All @@ -291,10 +289,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-amd64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209152.2'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16ds_v5'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand All @@ -314,10 +311,9 @@ stages:
- bash: |
echo '##vso[task.setvariable variable=OS_SKU]AzureContainerLinux'
echo '##vso[task.setvariable variable=OS_VERSION]acl'
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-arm64-gen2-acl'
echo '##vso[task.setvariable variable=IMG_VERSION]3.20260809.01'
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]ae6ab47f-1fc9-4b67-8f82-4636119119c9-ACL'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-3.0-arm64'
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]20260923.1209110.1'
echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16pds_v6'
echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
Expand Down
12 changes: 6 additions & 6 deletions spec/vhdbuilder/packer/ensure_sig_image_name_linux_spec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,13 @@ Describe 'ensure_sig_image_name_linux function'
End
End

Describe 'IMG_OFFER azure-linux-3 with OS_SKU AzureContainerLinux (ACL) scenarios'
# ACL shares the azure-linux-3 marketplace offer but its destination SIG image
Describe 'OS_SKU AzureContainerLinux (ACL) scenarios'
# ACL uses a direct shared gallery source image. Its destination SIG image
# definitions (aclgen2TL, aclgen2arm64TL) intentionally have no AzureLinux prefix.
It 'should NOT add AzureLinux prefix when OS_SKU is AzureContainerLinux (gen2 TL)'
SIG_IMAGE_NAME=""
SKU_NAME="aclgen2TL"
IMG_OFFER="azure-linux-3"
IMG_OFFER=""
OS_SKU="AzureContainerLinux"
When call ensure_sig_image_name_linux
The status should be success
Expand All @@ -229,7 +229,7 @@ Describe 'ensure_sig_image_name_linux function'
It 'should NOT add AzureLinux prefix when OS_SKU is AzureContainerLinux (arm64 gen2 TL)'
SIG_IMAGE_NAME=""
SKU_NAME="aclgen2arm64TL"
IMG_OFFER="azure-linux-3"
IMG_OFFER=""
OS_SKU="AzureContainerLinux"
When call ensure_sig_image_name_linux
The status should be success
Expand All @@ -240,7 +240,7 @@ Describe 'ensure_sig_image_name_linux function'
It 'should handle case-insensitive OS_SKU azurecontainerlinux (lowercase)'
SIG_IMAGE_NAME=""
SKU_NAME="aclgen2TL"
IMG_OFFER="azure-linux-3"
IMG_OFFER=""
OS_SKU="azurecontainerlinux"
When call ensure_sig_image_name_linux
The status should be success
Expand All @@ -251,7 +251,7 @@ Describe 'ensure_sig_image_name_linux function'
It 'should handle case-insensitive OS_SKU AzureContainerLinux (uppercase)'
SIG_IMAGE_NAME=""
SKU_NAME="aclgen2TL"
IMG_OFFER="azure-linux-3"
IMG_OFFER=""
OS_SKU="AZURECONTAINERLINUX"
When call ensure_sig_image_name_linux
The status should be success
Expand Down
Loading
Loading