Skip to content

[release/9.0] Use correct name for AZL3 build image#16512

Merged
akoeplinger merged 1 commit intorelease/9.0from
akoeplinger-patch-3
Feb 6, 2026
Merged

[release/9.0] Use correct name for AZL3 build image#16512
akoeplinger merged 1 commit intorelease/9.0from
akoeplinger-patch-3

Conversation

@akoeplinger
Copy link
Copy Markdown
Member

Backport of #16510

To double check:

@akoeplinger akoeplinger requested a review from haruna99 February 6, 2026 18:53
@akoeplinger
Copy link
Copy Markdown
Member Author

/backport to release/8.0

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 6, 2026

Started backporting to release/8.0 (link to workflow run)

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 6, 2026

@akoeplinger backporting to release/8.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: [release/9.0] Use correct name for AZL3 build image
Using index info to reconstruct a base tree...
A	eng/common/core-templates/job/source-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/common/templates-official/job/source-build.yml
CONFLICT (content): Merge conflict in eng/common/templates-official/job/source-build.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 [release/9.0] Use correct name for AZL3 build image
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@akoeplinger akoeplinger enabled auto-merge (squash) February 6, 2026 19:04
@akoeplinger akoeplinger merged commit 69a6ee9 into release/9.0 Feb 6, 2026
9 of 10 checks passed
@akoeplinger akoeplinger deleted the akoeplinger-patch-3 branch February 6, 2026 21:52
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.

2 participants