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

ci/cirrus: use Fedora 35 #3261

Merged
merged 3 commits into from
Nov 4, 2021
Merged

ci/cirrus: use Fedora 35 #3261

merged 3 commits into from
Nov 4, 2021

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Nov 4, 2021

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

@kolyshkin kolyshkin force-pushed the test-f35 branch 2 times, most recently from b744b03 to bb0f029 Compare November 4, 2021 01:49
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
@kolyshkin
Copy link
Contributor Author

@rata @AkihiroSuda PTAL

@AkihiroSuda
Copy link
Member

Thanks, still draft?

@kolyshkin kolyshkin changed the title [DNM] test on f35 ci/cirrus: use Fedora 35 Nov 4, 2021
@kolyshkin kolyshkin marked this pull request as ready for review November 4, 2021 03:13
@kolyshkin
Copy link
Contributor Author

No longer a draft. I have also changed the branch protection rules to require vagrant / DISTRO: fedora job.

@kolyshkin
Copy link
Contributor Author

@thaJeztah @cyphar PTAL

@mrunalp mrunalp merged commit 931eb94 into opencontainers:master Nov 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants