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

nixos/tests/installer: spring cleaning #300757

Merged
merged 2 commits into from
Apr 5, 2024

Conversation

K900
Copy link
Contributor

@K900 K900 commented Apr 1, 2024

Description of changes

See commit message for up to date details.

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.

@K900 K900 marked this pull request as ready for review April 1, 2024 18:41
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Apr 1, 2024
@K900 K900 force-pushed the installer-tests-unfucking branch from f542bbf to 8a72ec5 Compare April 1, 2024 19:22
@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 Apr 1, 2024
Copy link
Member

@JulienMalka JulienMalka left a comment

Choose a reason for hiding this comment

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

The simpleEfi* tests are failing

nixos/tests/installer.nix Show resolved Hide resolved
@K900 K900 force-pushed the installer-tests-unfucking branch from 8a72ec5 to b726cf3 Compare April 3, 2024 12:06
@github-actions github-actions bot added 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: testing Tooling for automated testing of packages and modules labels Apr 3, 2024
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 3, 2024
@K900 K900 force-pushed the installer-tests-unfucking branch from b726cf3 to 79df2ae Compare April 3, 2024 12:40
- use normal VM nodes for target, with some extra trickery
- rename preBootCommands to postBootCommands to match its actual intent
- rename VMs to installer and target, so they're not all called machine
- set platforms on non-UEFI tests properly
- add missing packages for systemd-boot test
- fix initrd secrets leaking into the store and having wrong paths
@K900 K900 changed the title nixos/tests/installer: avoid create_machine, clean up nixos/tests/installer: spring cleaning Apr 3, 2024
@K900 K900 force-pushed the installer-tests-unfucking branch from 79df2ae to 7b602cf Compare April 3, 2024 13:53
@K900
Copy link
Contributor Author

K900 commented Apr 3, 2024

Finally, all the tests pass (yes, even the ones that didn't before).

@K900 K900 requested a review from RaitoBezarius April 5, 2024 06:00
@K900
Copy link
Contributor Author

K900 commented Apr 5, 2024

Added a pretty ugly but still workaround.

@RaitoBezarius RaitoBezarius merged commit 99ca8d4 into NixOS:master Apr 5, 2024
21 checks passed
@@ -34,6 +34,13 @@ in
Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.
'';
};
platforms = lib.mkOption {
type = types.listOf types.raw;
default = lib.platforms.linux;
Copy link
Member

Choose a reason for hiding this comment

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

We also support darwin; to be added in

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: testing Tooling for automated testing of packages and modules 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants