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/zfs: fix using wrong package in tests; minor cleanup #284263

Merged
merged 3 commits into from
Jan 30, 2024
Merged

nixos/tests/zfs: fix using wrong package in tests; minor cleanup #284263

merged 3 commits into from
Jan 30, 2024

Conversation

amarshall
Copy link
Member

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jan 27, 2024
@amarshall amarshall mentioned this pull request Jan 27, 2024
Merged
13 tasks
@amarshall amarshall force-pushed the fix-zfs-test-wrong-pkg branch from a8168a3 to 1867841 Compare January 27, 2024 14:34
@amarshall amarshall changed the title zfs: fix using wrong package in tests nixos/tests/zfs: fix using wrong package in tests; minor cleanup Jan 27, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 27, 2024
@adamcstephens
Copy link
Contributor

@ofborg test zfs

@adamcstephens
Copy link
Contributor

Looks good on aarch64

─❯ nix-build -A nixosTests.zfs
/nix/store/p6cl31i5fzn0p8i0bmg62gdhcxml6lbw-vm-test-run-multi-disk-zfs
/nix/store/0a482yqh9f5z1b286gk2g6lzphcsf4jl-vm-test-run-installer-zfs-root
/nix/store/w8jkjywbfmjv3amvml1sp0g0d5n4dmcv-vm-test-run-installer-separateBootZfs
/nix/store/3jy87dp12s4f7vaxvh4qybrl0h9r56i0-vm-test-run-zfs-2.1-series
/nix/store/8s8px3h1pzqq7jrp12hcszbfffapcn9j-vm-test-run-zfs-stable
/nix/store/jxhjwqdby8khqnqi3fz1bvgbjxa8gcfb-vm-test-run-zfs-unstable
/nix/store/x07rv6rfs898l3mwwhmc77lz8y6nlsv5-vm-test-run-zfs-unstable

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 27, 2024
RaitoBezarius
RaitoBezarius reviewed Jan 27, 2024
View reviewed changes
nixos/tests/zfs.nix Outdated Show resolved Hide resolved
@amarshall
nixos/tests/zfs: improve naming
39ba1b4 
It is not one package, but the package set, and so is plural.
@amarshall
nixos/tests/zfs: decouple makeZfsTest params from unstable vs. stable
5d798a0 
enableUnstable was trying to do too much, it’s more obvious to remove
the indirection to set zfsPackage and push the semantics up to the
caller.
@amarshall amarshall force-pushed the fix-zfs-test-wrong-pkg branch from 1867841 to 5d798a0 Compare January 28, 2024 14:30
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 28, 2024
@RaitoBezarius RaitoBezarius merged commit bed6315 into NixOS:master Jan 30, 2024
19 checks passed
@amarshall amarshall deleted the fix-zfs-test-wrong-pkg branch January 31, 2024 03:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaitoBezarius RaitoBezarius RaitoBezarius left review comments

@adamcstephens adamcstephens adamcstephens approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@amarshall @adamcstephens @RaitoBezarius @delroth