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

[1.0] Use Cirrus CI for Vagrant tests #3101

Merged
merged 4 commits into from
Jul 28, 2021

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Jul 20, 2021

Cherry-pick #3088 #3104

ref: issue 3078

Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit 87bfd20)
Signed-off-by: Akihiro Suda <[email protected]>
kolyshkin
kolyshkin previously approved these changes Jul 20, 2021
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adrianreber
Copy link
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.

@AkihiroSuda
Copy link
Member Author

No need to run CentOS 7 or 8 in Vagrant on Cirrus CI.

PR is appreciated (for the master branch)

@adrianreber
Copy link
Contributor

No need to run CentOS 7 or 8 in Vagrant on Cirrus CI.

PR is appreciated (for the master branch)

See #3104

@kolyshkin
Copy link
Contributor

Switching to draft until #3104 is merged; when we need to port both (I guess).

@kolyshkin kolyshkin marked this pull request as draft July 21, 2021 20:00
@kolyshkin kolyshkin self-requested a review July 21, 2021 20:00
kolyshkin and others added 3 commits July 27, 2021 15:20
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 <[email protected]>
(cherry picked from commit 86af524)
Signed-off-by: Akihiro Suda <[email protected]>
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 <[email protected]>
Signed-off-by: Adrian Reber <[email protected]>
(cherry picked from commit d448016)
Signed-off-by: Akihiro Suda <[email protected]>
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 <[email protected]>
(cherry picked from commit 9f656db)
Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda AkihiroSuda marked this pull request as ready for review July 27, 2021 06:21
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming it's a clean cherry-pick, LGTM

@AkihiroSuda
Copy link
Member Author

Yes, cherry-picks were clean

@kolyshkin kolyshkin merged commit 0b77b2d into opencontainers:release-1.0 Jul 28, 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.

4 participants