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.

Sign up for GitHub

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

Jump to bottom

nixos/tests/misc: account for cgroupv2 #105594

Merged
merged 1 commit into from Dec 1, 2020
Merged

nixos/tests/misc: account for cgroupv2 #105594

merged 1 commit into from Dec 1, 2020

Conversation

lukegb
Copy link
Contributor

@lukegb lukegb commented Dec 1, 2020

Motivation for this change

Since #104094 (d22b3ed), NixOS is
using the unified cgroup hierarchy by default (aka cgroupv2).

This means the blkio controller isn't there, so we should test for
something else (e.g. the presence of the io controller).

Fixes #105581.

cc @FRidh @flokli

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lukegb
nixos/tests/misc: account for cgroupv2
2a73e13 
Since NixOS#104094 (d22b3ed), NixOS is
using the unified cgroup hierarchy by default (aka cgroupv2).

This means the blkio controller isn't there, so we should test for
something else (e.g. the presence of the io controller).

Fixes NixOS#105581.
@lukegb
Copy link
Contributor Author

lukegb commented Dec 1, 2020

@ofborg test misc

@ofborg ofborg bot added the 6.topic: nixos label Dec 1, 2020
@FRidh FRidh merged commit b5a328e into NixOS:master Dec 1, 2020
@lukegb lukegb deleted the cgroupv2test branch December 1, 2020 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

vm-test-run-misc fails, blocking nixos-unstable(-small)
2 participants
@lukegb @FRidh