Skip to content

feat: ensure successful blob upload without prefetch optimization enabled #7613

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
zachary-bailey merged 27 commits into from
Jan 14, 2026
Merged

feat: ensure successful blob upload without prefetch optimization enabled #7613

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
16213bd
feat: change upload logic
zachary-bailey Jan 6, 2026
da5ce28
fix: storage container destination
zachary-bailey Jan 6, 2026
fa505d2
fix
zachary-bailey Jan 6, 2026
8768bf0
fix: move logic to yaml script
zachary-bailey Jan 6, 2026
661d0bc
fix
zachary-bailey Jan 6, 2026
a44c90a
fix
zachary-bailey Jan 6, 2026
953fd8f
Merge branch 'main' into zb/withoutPrefetch
zachary-bailey Jan 7, 2026
863967d
fix
zachary-bailey Jan 7, 2026
389b52f
chore: remove unnecessary vars
zachary-bailey Jan 7, 2026
7f373d1
fix
zachary-bailey Jan 7, 2026
f4c6d16
fix
zachary-bailey Jan 7, 2026
503a432
fix
zachary-bailey Jan 7, 2026
d7af98c
Merge branch 'main' into zb/withoutPrefetch
zachary-bailey Jan 8, 2026
666e815
fix
zachary-bailey Jan 8, 2026
2cae382
Merge branch 'main' into zb/withoutPrefetch
zachary-bailey Jan 9, 2026
743cd52
fix
zachary-bailey Jan 9, 2026
9fe4ee8
fix
zachary-bailey Jan 9, 2026
53a0423
fix: wrong var, pipeline vars are not ready until next step
zachary-bailey Jan 9, 2026
d2e806a
Merge branch 'main' into zb/withoutPrefetch
zachary-bailey Jan 12, 2026
2063591
chore: clarify step name
zachary-bailey Jan 12, 2026
b5ab7b4
fix
zachary-bailey Jan 12, 2026
a5b2296
fix: indent
zachary-bailey Jan 12, 2026
a95482c
fix
zachary-bailey Jan 12, 2026
0de9719
fix
zachary-bailey Jan 12, 2026
8f77f45
fix
zachary-bailey Jan 12, 2026
335768d
fix
zachary-bailey Jan 12, 2026
ebd8338
Merge branch 'main' into zb/withoutPrefetch
zachary-bailey Jan 13, 2026
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
56 changes: 53 additions & 3 deletions .pipelines/templates/.builder-release-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ steps:
SIG_IMAGE_NAME="$(cat vhdbuilder/packer/settings.json | grep "sig_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
BUILD_LOCATION="$(cat vhdbuilder/packer/settings.json | grep "location" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
ARTIFACT_ID=$(date +%s) && \
echo "##vso[task.setvariable variable=DESTINATION_STORAGE_CONTAINER]${CLASSIC_BLOB}" && \
echo "##vso[task.setvariable variable=ARTIFACT_ID]${ARTIFACT_ID}" && \
echo "##vso[task.setvariable variable=PACKER_BUILD_LOCATION]${BUILD_LOCATION}" && \
echo "##vso[task.setvariable variable=PACKER_VNET_RESOURCE_GROUP_NAME]${PACKER_VNET_RESOURCE_GROUP_NAME}" && \
Expand Down Expand Up @@ -160,6 +161,33 @@ steps:
condition: always()
displayName: Set Post-Build Variables

- task: AzureCLI@2
inputs:
azureSubscription: $(VHD_ARM_SERVICE_CONNECTION)
scriptType: bash
scriptLocation: inlineScript
inlineScript: |
echo "##vso[task.setvariable variable=DESTINATION_STORAGE_CONTAINER]${CLASSIC_BLOB_STAGING}" && \
STAGING_CONTAINER_EXISTS=$(az storage container exists --account-name ${STORAGE_ACCOUNT_NAME} --name $VHD_STAGING_CONTAINER_NAME --auth-mode login | jq -r '.exists')
if [ "${STAGING_CONTAINER_EXISTS,,}" = "false" ]; then
echo "Creating staging container $VHD_STAGING_CONTAINER_NAME in storage account $STORAGE_ACCOUNT_NAME"
az storage container create --account-name "$STORAGE_ACCOUNT_NAME" --name "$VHD_STAGING_CONTAINER_NAME" --auth-mode login || exit 1
else
echo "Staging container $VHD_STAGING_CONTAINER_NAME already exists in storage account $STORAGE_ACCOUNT_NAME"
fi
echo "DESTINATION_STORAGE_CONTAINER is set to ${CLASSIC_BLOB_STAGING}"
condition: |
or(
and(
succeeded(),
eq(variables.GENERATE_PUBLISHING_INFO, 'True'),
eq(variables.RUN_PREFETCH_OPTIMIZATION, 'False'),
eq(variables.ENVIRONMENT, 'tme')
),
eq(variables.BUILDER, 'imagecustomizer')
)
displayName: Set Destination Storage Container

- task: AzureCLI@2
inputs:
azureSubscription: $(VHD_ARM_SERVICE_CONNECTION)
Expand All @@ -173,9 +201,6 @@ steps:
env:
RESOURCE_GROUP_NAME: $(AZURE_RESOURCE_GROUP_NAME)
GENERATE_PUBLISHING_INFO: $(GENERATE_PUBLISHING_INFO)
CLASSIC_BLOB_STAGING: $(CLASSIC_BLOB_STAGING)
VHD_CONTAINER_NAME: $(VHD_CONTAINER_NAME)
VHD_STAGING_CONTAINER_NAME: $(VHD_STAGING_CONTAINER_NAME)

- task: AzureCLI@2
inputs:
Expand Down Expand Up @@ -316,6 +341,31 @@ steps:
env:
RESOURCE_GROUP_NAME: $(AZURE_RESOURCE_GROUP_NAME)

- task: AzureCLI@2
inputs:
azureSubscription: $(VHD_ARM_SERVICE_CONNECTION)
scriptType: bash
scriptLocation: inlineScript
inlineScript: |
echo "Copying ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd to immutable storage container"
export AZCOPY_AUTO_LOGIN_TYPE="AZCLI"
export AZCOPY_CONCURRENCY_VALUE="AUTO"
az storage blob copy start --account-name "$STORAGE_ACCOUNT_NAME" --destination-blob "${CAPTURED_SIG_VERSION}.vhd" --destination-container "$VHD_CONTAINER_NAME" --source-uri "${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd" --auth-mode login || exit 1
echo "Successfully copied to immutable container"
# Remove old VHD from staging container after copy to immutable container is complete
azcopy remove "${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true
condition: |
or(
and(
succeeded(),
eq(variables.GENERATE_PUBLISHING_INFO, 'True'),
eq(variables.RUN_PREFETCH_OPTIMIZATION, 'False'),
eq(variables.ENVIRONMENT, 'tme')
),
eq(variables.BUILDER, 'imagecustomizer')
)
displayName: Copy to Immutable Storage Container

- task: DownloadPipelineArtifact@2
displayName: Download Build Performance Program
condition: and(succeeded(), eq(variables.ENVIRONMENT, 'tme'))
Expand Down
6 changes: 3 additions & 3 deletions vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ if [ "$sas" = "None" ]; then
fi
capture_benchmark "${SCRIPT_NAME}_grant_access_to_disk"

echo "Uploading $disk_resource_id to ${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd"
echo "Uploading $disk_resource_id to ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd"

echo "Setting azcopy environment variables with pool identity: $AZURE_MSI_RESOURCE_STRING"
export AZCOPY_AUTO_LOGIN_TYPE="AZCLI"
Expand All @@ -139,7 +139,7 @@ export AZCOPY_JOB_PLAN_LOCATION="$(pwd)/azcopy-job-plan-files/"
mkdir -p "${AZCOPY_LOG_LOCATION}"
mkdir -p "${AZCOPY_JOB_PLAN_LOCATION}"

if ! azcopy copy "${sas}" "${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true ; then
if ! azcopy copy "${sas}" "${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true ; then
azExitCode=$?
# loop through azcopy log files
shopt -s nullglob
Expand All @@ -159,7 +159,7 @@ if ! azcopy copy "${sas}" "${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd" --recurs
exit $azExitCode
fi

echo "Uploaded $disk_resource_id to ${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd"
echo "Uploaded $disk_resource_id to ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd"
capture_benchmark "${SCRIPT_NAME}_upload_disk_to_blob"

if ! az disk revoke-access --ids $disk_resource_id; then
Expand Down
25 changes: 1 addition & 24 deletions vhdbuilder/packer/imagecustomizer/scripts/publish-imagecustomizer-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,6 @@ export AZCOPY_JOB_PLAN_LOCATION="$(pwd)/azcopy-job-plan-files/"
mkdir -p "${AZCOPY_LOG_LOCATION}"
mkdir -p "${AZCOPY_JOB_PLAN_LOCATION}"

if [ "${ENVIRONMENT,,}" = "tme" ]; then
# If environment is TME, we use a staging container in order to later copy the blob to an immutable container.
DESTINATION_STORAGE_CONTAINER=${CLASSIC_BLOB_STAGING}
STAGING_CONTAINER_EXISTS=$(az storage container exists --account-name ${STORAGE_ACCOUNT_NAME} --name $VHD_STAGING_CONTAINER_NAME --auth-mode login | jq -r '.exists')
if [ "${STAGING_CONTAINER_EXISTS,,}" = "false" ]; then
echo "Creating staging container $VHD_STAGING_CONTAINER_NAME in storage account $STORAGE_ACCOUNT_NAME"
az storage container create --account-name "$STORAGE_ACCOUNT_NAME" --name "$VHD_STAGING_CONTAINER_NAME" --auth-mode login || exit 1
else
echo "Staging container $VHD_STAGING_CONTAINER_NAME already exists in storage account $STORAGE_ACCOUNT_NAME"
fi
else
DESTINATION_STORAGE_CONTAINER=${CLASSIC_BLOB}
fi

echo "Uploading ${OUT_DIR}/${CONFIG}.vhd to ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd"
if ! azcopy copy "${OUT_DIR}/${CONFIG}.vhd" "${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true; then
azExitCode=$?
Expand All @@ -83,15 +69,6 @@ fi

echo "Uploaded ${OUT_DIR}/${CONFIG}.vhd to ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd"

if [ "${ENVIRONMENT,,}" = "tme" ] && [ "${GENERATE_PUBLISHING_INFO,,}" = "true" ]; then
echo "Copying ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd to immutable storage container"
az storage blob copy start --account-name "$STORAGE_ACCOUNT_NAME" --destination-blob "${CAPTURED_SIG_VERSION}.vhd" --destination-container "$VHD_CONTAINER_NAME" --source-uri "${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd" --auth-mode login || exit 1
echo "Successfully copied to immutable container"
else
echo "GENERATE_PUBLISHING_INFO is false or we are in a testing / prod environment, skipping copying ${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd to immutable storage container"
fi
capture_benchmark "${SCRIPT_NAME}_upload_vhd_to_blob"

GALLERY_RESOURCE_ID=/subscriptions/${SUBSCRIPTION_ID}/resourceGroups/${RESOURCE_GROUP_NAME}/providers/Microsoft.Compute/galleries/${SIG_GALLERY_NAME}
SIG_IMAGE_RESOURCE_ID="${GALLERY_RESOURCE_ID}/images/${SIG_IMAGE_NAME}/versions/${CAPTURED_SIG_VERSION}"
MANAGED_IMAGE_RESOURCE_ID="/subscriptions/${SUBSCRIPTION_ID}/resourceGroups/${RESOURCE_GROUP_NAME}/providers/Microsoft.Compute/images/${IMAGE_NAME}"
Expand Down Expand Up @@ -126,7 +103,7 @@ az sig image-version create \
--target-regions ${TARGET_REGIONS}
capture_benchmark "${SCRIPT_NAME}_create_sig_image_version"

if [ "${ENVIRONMENT,,}" = "tme" ] || [ "${GENERATE_PUBLISHING_INFO,,}" = "false" ]; then
if [ "${ENVIRONMENT,,}" = "tme" ] && [ "${GENERATE_PUBLISHING_INFO,,}" = "false" ]; then
Copy link
Contributor

@cameronmeissner cameronmeissner Jan 12, 2026

Choose a reason for hiding this comment

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

so this is to ensure that we always remove the blob from staging assuming we aren't publishing AND we're in TME?
I'm just wondering why we're changing the OR to an AND here

Copy link
Contributor Author

@zachary-bailey zachary-bailey Jan 12, 2026

Choose a reason for hiding this comment

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

Because if it was OR, then just by being in TME we would erase the blob, which doesn't work for us since its now copied in a later pipeline step. So copying the blob to immutable storage would always fail

Copy link
Contributor Author

@zachary-bailey zachary-bailey Jan 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

but if were in TME AND GENERATE_PUBLISHING _INFO is false, then we know we can safely delete, because that later pipeline step will never run

Copy link
Contributor Author

@zachary-bailey zachary-bailey Jan 12, 2026

Choose a reason for hiding this comment

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

but come to think of it, this should probably only evaluate the value of GENERATE_PUBLISHING_INFO now

Copy link
Contributor

@cameronmeissner cameronmeissner Jan 12, 2026

Choose a reason for hiding this comment

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

agreed

Copy link
Contributor Author

@zachary-bailey zachary-bailey Jan 12, 2026

Choose a reason for hiding this comment

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

fixed

azcopy remove "${DESTINATION_STORAGE_CONTAINER}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true
fi

Expand Down
Loading