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

Fix IPFS container start routine #3181

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Conversation

apostasie
Copy link
Contributor

@apostasie apostasie commented Jul 5, 2024

TestIPFSAddress and TestIPFSComposeUp have been failing regularly on the CI (with a rather long timeout).

Furthermore, the initialization code was using static ports and container name, making it impossible to parallelize.

This PR rewrites the initialization code of the IPFS registry container after the regular registry container start method - giving guarantees that there is no port or name collision, a sensible timeout in case of failure, an actual test to verify the registry is up and running.
It also removes the unnecessary testing of detached-ns (apparently triggering failures with rootlesskit 1).

CI is green on push (except for 1 unrelated failure involving systemctl that we have seen somewhere else).

Along with the other changes from today, this PR should increase CI reliability quite a bit.

PTAL at your convenience @AkihiroSuda @ktock .

Of course would love to see this in ASAP as failing CI has been a massive PITA, but lmk evidently if there is anything you would like tweaked.

Cheers.

@AkihiroSuda AkihiroSuda requested a review from ktock July 5, 2024 10:11
@apostasie apostasie changed the title Fix/enhance IPFS tests [WIP] Fix/enhance IPFS tests Jul 5, 2024
@apostasie apostasie force-pushed the dev-ci-ipfs branch 4 times, most recently from 73ea2cb to 3e44585 Compare July 5, 2024 21:18
@apostasie apostasie mentioned this pull request Jul 6, 2024
3 tasks
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@apostasie apostasie marked this pull request as ready for review July 6, 2024 05:36
@apostasie apostasie changed the title [WIP] Fix/enhance IPFS tests Fix IPFS registry start routine Jul 6, 2024
@apostasie apostasie changed the title Fix IPFS registry start routine Fix IPFS container start routine Jul 6, 2024
@AkihiroSuda AkihiroSuda added this to the v2.0.0 milestone Jul 6, 2024
@AkihiroSuda AkihiroSuda added area/ci e.g., CI failure area/ipfs IPFS labels Jul 6, 2024

name := testutil.Identifier(base.T)
// listen on 0.0.0.0 to enable 127.0.0.1
listenIP := net.ParseIP("0.0.0.0")
Copy link
Member

Choose a reason for hiding this comment

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

Why not 127.0.0.1?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Then it will not allow access using (non-localhost) host-ip, reducing possible test scope (comment is slightly misleading, originating from previous code in the registry start function).

Copy link
Member

@ktock ktock left a comment

Choose a reason for hiding this comment

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

Thanks

@ktock ktock merged commit 987d720 into containerd:main Jul 9, 2024
26 checks passed
@apostasie
Copy link
Contributor Author

Thanks a lot @ktock
Appreciate your time and attentive review.

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 area/ipfs IPFS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants