CI fixes#4085
Merged
kolyshkin merged 3 commits intoopencontainers:mainfrom Oct 24, 2023
Merged
Conversation
kolyshkin
force-pushed
the
fix-check_cgroup_value
branch
4 times, most recently
from
f90e238 to
e9b9301
Compare
kolyshkin
force-pushed
the
fix-check_cgroup_value
branch
2 times, most recently
from
824feb6 to
93f28e4
Compare
Commit e158483 did two modifications to check_cgroup_value(): 1. It now skips the test if the file is not found. 2. If the comparison failed, a second comparison, with value divided by 1000, is performed. These modifications were only needed for cpu.burst, but instead were done in a generic function used from many cgroup tests. As a result, we can no longer be sure about the test coverage (item 1) and the check being correct (item 2) anymore. In fact, part of "update cgroup cpu limits" test is currently skipped on CentOS 7 and 8 because of item 1. To fix: - replace item 1 with a new "cgroups_cpu_burst" argument for "requires", and move the test to a separate case; - replace item 2 with a local change in check_cpu_burst. Fixes: e158483 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin
force-pushed
the
fix-check_cgroup_value
branch
from
93f28e4 to
7f5daa8
Compare
kolyshkin
requested review from
AkihiroSuda,
cyphar,
dqminh,
hqhq,
lifubang and
thaJeztah
cyphar
approved these changes
Oct 23, 2023
Contributor
Author
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
3 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.
Fixups after PR #3205
tests/int: fix cgroup tests
Commit e158483 did two modifications to check_cgroup_value():
It now skips the test if the file is not found.
If the comparison failed, a second comparison, with value divided by 1000,
is performed.
These modifications were only needed for cpu.burst, but instead were done
in a generic function used from many cgroup tests. As a result, we can
no longer be sure about the test coverage (item 1) and the check being
correct (item 2) anymore. In fact, part of "update cgroup cpu limits"
test is currently skipped on CentOS 7 and 8 because of item 1.
To fix:
and move the test to a separate case;
libct/cg/fs.Set: fix error message
There is no point in showing the underlying error when
path == "",because it is inevitably
ENOENT.Revert the change done in commit e158483.
Fixup after PR #4073
tests/int: fix "runc run (hugetlb limits)"
Recent commit 4a7d3ae had a bug.