Skip to content
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.

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

CI/test fixing #3402

Merged
merged 2 commits into from
Sep 4, 2024
Merged

CI/test fixing #3402

merged 2 commits into from
Sep 4, 2024

Conversation

apostasie
Copy link
Contributor

@apostasie apostasie commented Sep 3, 2024

Tiny commits enhancing our test situation - making sure we do cleanup resources once done, to avoid polluting other tests expecting a clean slate.

Fix #3403

@AkihiroSuda can we get this in? (see question inline though)

}

tearDown := func() {
base.Cmd("rmi", "-f", img).AssertOK()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Make sure we cleanup the image once done.

fb, err := os.ReadFile(output)
assert.NilError(t, err)

assert.Assert(t, strings.Contains(string(fb), fmt.Sprintf("Loaded image: %s:latest", img)))
base.Cmd("images").AssertOutContains(testutil.ImageRepo(testutil.CommonImage))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I do not understand what that was supposed to test.
It makes much more sense to me that we testing the fact the loaded image (with custom tag) is there, instead of testing what we know is there already...

Am I missing something here?

@apostasie apostasie marked this pull request as ready for review September 3, 2024 22:33
@apostasie apostasie changed the title [WIP] CI/test fixing CI/test fixing Sep 3, 2024
@apostasie
Copy link
Contributor Author

CI failures are:

  • IPFSCompose - ping @ktock
  • random network fluke breaking go / dockerfile build

@AkihiroSuda AkihiroSuda added this to the v2.0.0 milestone Sep 4, 2024
@AkihiroSuda AkihiroSuda added the area/ci e.g., CI failure label Sep 4, 2024
@AkihiroSuda
Copy link
Member

Thanks, but commit messages should explain what failure was fixed

…ng prune

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
…ootless

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@apostasie
Copy link
Contributor Author

Thanks, but commit messages should explain what failure was fixed

Fair enough.
Latest push makes it a bit better.

Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 1b94da9 into containerd:main Sep 4, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ci e.g., CI failure
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rootlesskit / apparmor output inconsistent w/wo root?
2 participants