ci/cirrus: use Fedora 35#3261
Merged
mrunalp merged 3 commits intoopencontainers:masterfrom Nov 4, 2021
Merged
Conversation
b744b03 to
bb0f029
Compare
The misc cgroup controller, introduced in Linux 5.13, is still unknown to systemd, and thus it cannot delegate it. Add an appropriate fixup to the test case, similar to an earlier commit 601cf58. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Some test directories are created using mktemp -d, and so they have permissions set to 0700 and are thus inaccessible to a user inside userns. This was workarounded for $ROOT in userns.bats before. Now, when we have updated Cirrus CI config to use Fedora 35 (rather than 34), userns tests fail: > runc run failed: unable to start container process: error during > container init: error preparing rootfs: mount > /tmp/bats-run-4pCERd/runc.f66gCC/bundle/rootfs:/tmp/bats-run-4pCERd/runc.f66gCC/bundle/rootfs, > flags: 0x5000: permission denied Fedora 34 image used kernel v5.11, while Fedora 35 has v5.15. Apparently, the newer kernel also checks that the parent directories are accessible by the user before doing mount. Move the old workaround from userns.bats to helpers.bats, drop the r bit (not needed), and add $BATS_RUN_TMPDIR (also created by mktemp -d) to fix userns.bats test failures under Fedora 35. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Also rename `Vagrantfile.fedora%d` to `Vagrantfile.fedora` so that we do not need to reset the commit log on upgrading the Fedora release. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Contributor
Author
|
@rata @AkihiroSuda PTAL |
AkihiroSuda
approved these changes
Nov 4, 2021
Member
|
Thanks, still draft? |
Contributor
Author
|
No longer a draft. I have also changed the branch protection rules to require |
Contributor
Author
|
@thaJeztah @cyphar PTAL |
mrunalp
approved these changes
Nov 4, 2021
This was referenced Nov 4, 2021
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.
Use Fedora 35 for testing; fix two test issues caused by the newer kernel.
This includes/carries #3258 and obsoletes #3260.
Closes: #3258
Closes: #3260