-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
[1.0] fix ci #3282
Merged
thaJeztah
merged 2 commits into
opencontainers:release-1.0
from
kolyshkin:1.0-fix-ci-for-criu-3.16
Nov 16, 2021
Merged
[1.0] fix ci #3282
thaJeztah
merged 2 commits into
opencontainers:release-1.0
from
kolyshkin:1.0-fix-ci-for-criu-3.16
Nov 16, 2021
Conversation
This file contains 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
The ParentImage set by the test should be a path relative to ImagesDirectory, pointing to a parent images directory (created by pre-dump). The parent directory is created by TempDir and so its name is not constant but has a variable suffix. So, the config was pointing to a non-existent directory. This left unnoticed by criu as it assumed the parent image does not exist, and performed a full dump. Since criu PR 1403 (will be a part of criu 3.16) that is no longer the case -- the invalid parent path is treated as an error, and so our test fails like this: == RUN TestCheckpoint checkpoint_test.go:145: === /tmp/criu070876105/dump.log === checkpoint_test.go:145: open /tmp/criu070876105/dump.log: no such file or directory checkpoint_test.go:146: criu failed: type DUMP errno 56 log file: /tmp/criu070876105/dump.log --- FAIL: TestCheckpoint (0.26s) Fix this by using the actual name of the parent image dir. Fixes: 98f0041 Signed-off-by: Kir Kolyshkin <[email protected]>
This needs #3069 backported. Will add. |
Add CAP_SYSLOG to ensure that /dev/kmsg can be accesses on systems where the sysctl kernel.dmesg_restrict = 1. Signed-off-by: Odin Ugedal <[email protected]> (cherry picked from commit 6be088d) Signed-off-by: Kir Kolyshkin <[email protected]>
OK, now I know why we need periodical (rather than per-PR) CI jobs. Will add. |
mrunalp
approved these changes
Nov 16, 2021
@AkihiroSuda @thaJeztah PTAL |
thaJeztah
approved these changes
Nov 16, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
TL;DR: backports of #3112 and #3069 to release-1.0 branch to fix CI broken by upstream updates.
1. libct/int/checkpoint_test: fix ParentImage
The ParentImage set by the test should be a path relative to
ImagesDirectory, pointing to a parent images directory (created
by pre-dump).
The parent directory is created by TempDir and so its name is not
constant but has a variable suffix. So, the config was pointing to
a non-existent directory.
This left unnoticed by criu as it assumed the parent image does not
exist, and performed a full dump.
Since criu PR checkpoint-restore/criu#1403 (will be a part of criu 3.16) that is no longer the
case -- the invalid parent path is treated as an error, and so our
test fails like this:
Fix this by using the actual name of the parent image dir.
This fixes release-1.0 CI against criu 3.16.
Fixes: 98f0041
Fixes: #3278
NOTE
2. tests/int/dev: add CAP_SYSLOG to /dev/kmsg tests
Add CAP_SYSLOG to ensure that /dev/kmsg can be accesses on systems where
the sysctl kernel.dmesg_restrict = 1.
(This is a backport of #3069 to release-1.0)