Skip to content

test-integration: support cgroup2#41065

Merged
thaJeztah merged 1 commit intomoby:masterfrom
AkihiroSuda:cgroup2-ci
Jul 16, 2020
Merged

test-integration: support cgroup2#41065
thaJeztah merged 1 commit intomoby:masterfrom
AkihiroSuda:cgroup2-ci

Conversation

@AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Jun 3, 2020 •
edited
Loading

- What I did

added cgroup2 support for make integration.

We don't have actual CI instances yet. (Can we use Fedora 32 Vagrant on either GH actions as in containerd or on Travis as in runc? )

- How I did it

  • Modified hack/dind to initialize nested controllers.
  • Updated integration tests to refer cgroup v2 paths.

- How to verify it
Tests are passing on Ubuntu 20.04 with:
DOCKER_BUILD_ARGS="--build-arg CONTAINERD_COMMIT=bf672cccee2a0baf4720ec534a738f6003c0e5a7 --build-arg RUNC_COMMIT=0fa097fc37c5d89e4cea4fda4663d1239e12a6fe" DOCKER_EXPERIMENTAL=1 TEST_SKIP_INTEGRATION_CLI=1 make test-integration

Depends on containerd master (v1.4) and runc master (v1.0.0-rc91).

Currently TEST_SKIP_INTEGRATION_CLI=1 must be specified.

- A picture of a cute animal (not mandatory but encouraged)

🐧

@AkihiroSuda AkihiroSuda requested a review from tianon as a code owner June 3, 2020 16:53
@AkihiroSuda AkihiroSuda mentioned this pull request Jun 3, 2020
Closed
8 tasks
@AkihiroSuda AkihiroSuda added this to the 20.03.0 milestone Jun 3, 2020
@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jun 3, 2020

cc @kolyshkin

tiborvass
tiborvass reviewed Jun 4, 2020
View reviewed changes
@tiborvass
Copy link
Contributor

tiborvass commented Jun 4, 2020

Also why must DOCKER_SYSTEMD=1 not be specified?

@tiborvass
Copy link
Contributor

tiborvass commented Jun 4, 2020

I can work on your PR to run a one-time Jenkins CI for cgroups v2 and once it's green and we're happy we could bring in those containerd / runc commits.

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jun 4, 2020 •
edited
Loading

systemd mode is just untested yet, will try later

Jenkins

Thanks, but this might be complicated because the host need to be bootstrapped with master binaries. I prepared binaries in
https://github.com/AkihiroSuda/moby-snapshot .

Also, the host needs to be very recent distro. Fedora 32 or Ubuntu 20.04 is preferred. Ubuntu still needs the GRUB configuration.

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jun 4, 2020

Do Jenkins hosts support running nested VM with Vagrant?

@tiborvass
Copy link
Contributor

tiborvass commented Jun 5, 2020

Thanks for the bootstrapping. I know about the requirements for recent hosts, currently we have 19.10 with the right grub config, I'm trying to get 20.04 instead.
I don't want to do nested VM if possible. If we can provision the right host with your bootstrapped docker do you see any other issue?

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jun 5, 2020

If we can provision the right host with your bootstrapped docker do you see any other issue?

no

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jun 5, 2020

Confirmed, DOCKER_SYSTEMD=1 passes the tests as well.

AkihiroSuda
AkihiroSuda commented Jun 16, 2020
View reviewed changes
@AkihiroSuda AkihiroSuda marked this pull request as draft June 17, 2020 10:31
@AkihiroSuda
test-integration: support cgroup2
ed89041 
Usage: DOCKER_BUILD_ARGS="--build-arg CONTAINERD_COMMIT=master --build-arg RUNC_COMMIT=master" DOCKER_EXPERIMENTAL=1 TEST_SKIP_INTEGRATION_CLI=1 make test-integration

Depends on containerd master (v1.4) and runc master (v1.0.0-rc91).

Currently `TEST_SKIP_INTEGRATION_CLI=1` must be specified.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jun 22, 2020

@tiborvass Let me know how I can help moving this forward.

@AkihiroSuda AkihiroSuda marked this pull request as ready for review June 30, 2020 04:18
@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jun 30, 2020

Maybe we can merge this as-is and update Jenkinsfile in a follow-up PR?

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Jul 15, 2020

ping @tiborvass @thaJeztah

tiborvass
tiborvass approved these changes Jul 16, 2020
View reviewed changes
Copy link
Contributor

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

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

Fine, let's do Jenkinsfile changes in a followup.

@tiborvass tiborvass mentioned this pull request Jul 16, 2020
Closed
thaJeztah
thaJeztah approved these changes Jul 16, 2020
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

#41218 was opened to track the follow-up

@thaJeztah thaJeztah merged commit 06832a7 into moby:master Jul 16, 2020
@YuviGold YuviGold mentioned this pull request Aug 21, 2020
Open
@AkihiroSuda AkihiroSuda added the area/cgroup2 cgroup v2 label Jan 23, 2021
@tianon tianon mentioned this pull request Apr 15, 2021
Closed
@Kern-- Kern-- mentioned this pull request Jul 20, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tiborvass tiborvass tiborvass approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

Assignees

No one assigned

Labels

area/cgroup2 cgroup v2 area/testing status/2-code-review

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

3 participants

@AkihiroSuda @tiborvass @thaJeztah