Skip to content

Conversation

rumpl
Copy link
Member

@rumpl rumpl commented Nov 2, 2023

- What I did

Skipped the busybox digest check when containerd is enabled since we always have a digest

- How I did it

- How to verify it

TestListImagesWithDigests should pass now.

$ make DOCKER_GRAPHDRIVER=overlayfs TEST_FILTER=TestListImagesWithDigests TEST_INTEGRATION_USE_SNAPSHOTTER=1 TEST_IGNORE_CGROUP_CHECK=1 test-integration

- Description for the changelog

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

We always have a digest with containerd.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
@rumpl rumpl added status/2-code-review area/images Image Distribution containerd-integration Issues and PRs related to containerd integration labels Nov 2, 2023
@rumpl rumpl added this to the 25.0.0 milestone Nov 2, 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

// We always have a digest when using containerd to store images
if !testEnv.UsingSnapshotter() {
// make sure busybox has tag, but not digest
busyboxRe := regexp.MustCompile(`\s*busybox\s*latest\s*<none>\s`)
Copy link
Member

Choose a reason for hiding this comment

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

Oh man; this is so fiddly. This test is really in need of an update / migration to the integration/ suite

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, this one would be way nicer in integration...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/images Image Distribution 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