[1.0] Use Cirrus CI for Vagrant tests #3101
Merged
Conversation
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
ref: issue 3078 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 87bfd20) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Contributor
|
No need to run CentOS 7 or 8 in Vagrant on Cirrus CI. You can directly use the CentOS images to boot: https://github.com/checkpoint-restore/criu/blob/criu-dev/.cirrus.yml For Fedora you probably need Vagrant (or something) as I have not found Fedora images for Google Cloud Engine. |
Member
Author
PR is appreciated (for the master branch) |
Contributor
See #3104 |
Contributor
|
Switching to draft until #3104 is merged; when we need to port both (I guess). |
Since commit f09a3e1, the value passed on to read starts with a slash, resulting in the first element of the array to be empty. As a result, the test tries to write to the top-level cgroup, which fails when rootless: > # Writing 1000000 to /sys/fs/cgroup/cpu,cpuacct//cpu.rt_period_us > # /tmp/bats-run-106184/bats.115768.src: line 548: /sys/fs/cgroup/cpu,cpuacct//cpu.rt_period_us: Permission denied To fix, remove the leading slash. An alternative fix would be to do "for ((i = 1;" instead of "i = 0", but that seems less readable. Fixes: f09a3e1 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 86af524) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Without this, the test case fails with > Writing 1000000 to /sys/fs/cgroup/cpu,cpuacct/runc-cgroups-integration-test/cpu.rt_period_us > /tmp/bats-run-106836/bats.116418.src: line 548: /sys/fs/cgroup/cpu,cpuacct/runc-cgroups-integration-test/cpu.rt_period_us: Permission denied Since we do not currently have a setup to test this, this went unnoticed (can be seen in RHEL8 though). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Adrian Reber <areber@redhat.com> (cherry picked from commit d448016) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
As Cirrus CI does not provide a real terminal this uses the same 'ssh -tt' workaround as the Vagrant setup. This sets up the CentOS 7 and 8 to allow SSH as root to localhost so that we can run all the tests via 'ssh -tt'. Not going through vagrant reduces CI times for CentOS 7 and 8 from 6 minutes to 4 minutes. Signed-off-by: Adrian Reber <areber@redhat.com> (cherry picked from commit 9f656db) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
kolyshkin
approved these changes
Jul 27, 2021
Contributor
kolyshkin
left a comment
kolyshkin
left a comment
There was a problem hiding this comment.
Assuming it's a clean cherry-pick, LGTM
Member
Author
|
Yes, cherry-picks were clean |
mrunalp
approved these changes
Jul 28, 2021
This was referenced Nov 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Cherry-pick #3088 #3104