Skip to content

integration-cli/TestCrossRepositoryLayerPush: Change repo name#46855

Merged
thaJeztah merged 1 commit intomoby:masterfrom
vvoland:c8d-fix-TestCrossRepositoryLayerPush
Nov 27, 2023
Merged

integration-cli/TestCrossRepositoryLayerPush: Change repo name#46855
thaJeztah merged 1 commit intomoby:masterfrom
vvoland:c8d-fix-TestCrossRepositoryLayerPush

Conversation

@vvoland
Copy link
Contributor

@vvoland vvoland commented Nov 27, 2023

Change the repo name used as for an intermediate image so it doesn't try to mount from the image pushed by TestBuildMultiStageImplicitPull.

Before this patch, this test failed because the distribution.source labels are not cleared between tests and the busybox content still has the distribution.source label pointing to the dockercli/testf repository which is no longer present in the test registry. So both dockercli/busybox and dockercli/testf are equally valid mount candidates for dockercli/crossrepopush and containerd algorithm just happens to select the last one.

This changes the repo name to not have the common repository component (dockercli) with the dockercli/testf repository.

- What I did

- How I did it

- How to verify it
Observe TestCrossRepositoryLayerPush result in CI.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Change the repo name used as for an intermediate image so it doesn't
try to mount from the image pushed by `TestBuildMultiStageImplicitPull`.

Before this patch, this test failed because the distribution.source
labels are not cleared between tests and the busybox content still has
the distribution.source label pointing to the `dockercli/testf`
repository which is no longer present in the test registry.
So both `dockercli/busybox` and `dockercli/testf` are equally valid
mount candidates for `dockercli/crossrepopush` and containerd algorithm
just happens to select the last one.

This changes the repo name to not have the common repository component
(`dockercli`) with the `dockercli/testf` repository.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland vvoland added area/testing containerd-integration Issues and PRs related to containerd integration labels Nov 27, 2023
@vvoland vvoland added this to the 25.0.0 milestone Nov 27, 2023
@vvoland vvoland self-assigned this Nov 27, 2023
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit bcf52ef into moby:master Nov 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/testing containerd-integration Issues and PRs related to containerd integration status/2-code-review

Projects

Development

Successfully merging this pull request may close these issues.

2 participants