fix checkpoint/restore tests on actuated-arm64#4276
Merged
AkihiroSuda merged 5 commits intoopencontainers:mainfrom May 20, 2024
Merged
fix checkpoint/restore tests on actuated-arm64#4276AkihiroSuda merged 5 commits intoopencontainers:mainfrom
AkihiroSuda merged 5 commits intoopencontainers:mainfrom
Conversation
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Since criu 2.12, rpcOpts is not needed when checking criu features. As we requires criu >= 3.0 in Checkpoint, we can remove rpcOpts. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
criu check --feature userns also tests for the /proc/self/ns/user presense, so remove the redundant check, and simplify the error message. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Since commit c77aaa3 the tail of criu log is printed by runc, so there's no need to do the same thing in tests. This also fixes a test failure on ARM where showLog fails (because there's no log file) and thus the conditional t.Skip is not called. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin
force-pushed
the
arm-cpt-test-fixes
branch
6 times, most recently
from
e4f3536 to
892cec6
Compare
kolyshkin
changed the title
Contributor
Author
|
@adrianreber @rst0git PTAL |
|
Hi @kolyshkin we can enable CONFIG_NF_TABLES_INET for you. What else is needed or dependent? |
Contributor
|
@kolyshkin I've updated the CRIU packages in OBS with the patch from checkpoint-restore/criu#2403. |
kolyshkin
force-pushed
the
arm-cpt-test-fixes
branch
from
892cec6 to
bac9f25
Compare
Contributor
Author
Awesome; I've removed the last commit so we're now running all tests on ARM (except, of course, pre-dump). |
Since we're now testing on ARM, the test case fails when trying to do pre-dump since MemTrack is not available. Skip the pre-dump part if so. This also reverts part of commit 3f4a73d as it is no longer needed (now, instead of skipping the whole test, we're just skipping the pre-dump). [Review with --ignore-all-space] Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin
force-pushed
the
arm-cpt-test-fixes
branch
from
bac9f25 to
36be6d0
Compare
lifubang
approved these changes
May 11, 2024
Member
lifubang
left a comment
lifubang
left a comment
There was a problem hiding this comment.
LGTM, please update your PR description.
kolyshkin
changed the title
AkihiroSuda
approved these changes
May 20, 2024
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While investigating #4274 I found a few issues and rough edges with our c/r tests.
This, together with checkpoint-restore/criu#2403 (which is already applied to CRIU package we use) fixes CI failures we see now.
Fixes: #4274.