Use new ACR for registry image #49677
Conversation
baronfel
added
Area-Infrastructure
Area-Containers
There was a problem hiding this comment.
Pull Request Overview
This PR updates the integration tests to use a newly provisioned Azure Container Registry (ACR) image as the pull source. It introduces configurable registry image constants and redirects the local registry startup command to use the ACR image.
- Introduce
SDK_AzureContainerRegistryImageandDocker_HubRegistryImageconstants - Add
RegistryImageToUseproperty to select the active registry image - Update
ContainerCli.RunCommandcall to useRegistryImageToUseand add a TODO for pivot logic
Comments suppressed due to low confidence (1)
test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs:31
- Add or update integration tests to cover both registry selection paths (
SDK_AzureContainerRegistryImageandDocker_HubRegistryImage) to ensureRegistryImageToUsebehaves as expected under different configurations.
private static string RegistryImageToUse => SDK_AzureContainerRegistryImage;
test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs
Show resolved
Hide resolved
test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs
Show resolved
Hide resolved
|
/backport to 9.0.1xx |
|
/backport to 9.0.3xx |
|
Started backporting to 9.0.1xx: https://github.com/dotnet/sdk/actions/runs/16150293269 |
|
Started backporting to 9.0.3xx: https://github.com/dotnet/sdk/actions/runs/16150296197 |
|
/backport to 8.0.1xx |
|
/backport to 8.0.3xx |
|
Started backporting to 8.0.1xx: https://github.com/dotnet/sdk/actions/runs/16150299913 |
|
/backport to 8.0.4xx |
|
Started backporting to 8.0.3xx: https://github.com/dotnet/sdk/actions/runs/16150301406 |
|
@nagilson an error occurred while backporting to "9.0.1xx", please check the run log for details! The process '/usr/bin/git' failed with exit code 1 |
|
@nagilson an error occurred while backporting to "9.0.3xx", please check the run log for details! The process '/usr/bin/git' failed with exit code 1 |
|
Started backporting to 8.0.4xx: https://github.com/dotnet/sdk/actions/runs/16150302958 |
|
@nagilson an error occurred while backporting to "8.0.1xx", please check the run log for details! The process '/usr/bin/git' failed with exit code 1 |
|
@nagilson an error occurred while backporting to "8.0.3xx", please check the run log for details! The process '/usr/bin/git' failed with exit code 1 |
|
/backport to release/9.0.1xx |
|
@nagilson an error occurred while backporting to "8.0.4xx", please check the run log for details! The process '/usr/bin/git' failed with exit code 1 |
|
/backport to release/9.0.3xx |
|
Started backporting to release/9.0.1xx: https://github.com/dotnet/sdk/actions/runs/16150309660 |
|
Started backporting to release/9.0.3xx: https://github.com/dotnet/sdk/actions/runs/16150311338 |
|
/backport to release/8.0.3xx |
|
/backport to release/8.0.1xx |
|
Started backporting to release/8.0.3xx: https://github.com/dotnet/sdk/actions/runs/16150314694 |
|
Started backporting to release/8.0.1xx: https://github.com/dotnet/sdk/actions/runs/16150316988 |
|
/backport to release/8.0.4xx |
|
Started backporting to release/8.0.4xx: https://github.com/dotnet/sdk/actions/runs/16150321709 |
|
@nagilson backporting to "release/8.0.1xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: use new ACR for registry image
Using index info to reconstruct a base tree...
A test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs
CONFLICT (content): Merge conflict in src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs
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 use new ACR for registry image
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
3 participants
Fixes #42026
Uses a new ACR that has been set up as the pull source for our tests.