Navigation Menu

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

Jump to bottom

boot tests: don't use globbing #65259

Merged
merged 1 commit into from Jul 22, 2019
Merged

boot tests: don't use globbing #65259

merged 1 commit into from Jul 22, 2019

Conversation

abbradar
Copy link
Member

@abbradar abbradar commented Jul 22, 2019 •
edited

Motivation for this change

Fix boot tests without resorting to shell-in-Perl injection. See also #65214.

Things done

Ran the following tests:

  • tests.boot.biosUsb.x86_64-linux
  • tests.boot.uefiUsb.x86_64-linux
  • tests.boot.uefiCdrom.x86_64-linux
  • tests.boot.biosCdrom.x86_64-linux
  • tests.boot.uefiNetboot.x86_64-linux
  • tests.boot.biosNetboot.x86_64-linux

Combined testing with #65212:

  • tests.installer.simple.x86_64-linux
  • tests.bittorrent.x86_64-linux
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@abbradar abbradar mentioned this pull request Jul 22, 2019
Closed
14 tasks
@abbradar
Copy link
Member Author

@GrahamcOfBorg test boot.uefiCdrom.x86_64-linux boot.uefiNetboot.x86_64-linux

@abbradar
Copy link
Member Author

@GrahamcOfBorg test boot.uefiCdrom.x86_64-linux boot.uefiNetboot.x86_64-linux

Simplified quoting; should affect only uefiNetboot but both tests were cancelled.

@abbradar
boot tests: don't use globbing
863bfbf 
Turns out I broke all the boot tests except netboot.

Instead of relying on build-time search for .iso we can use a proper attribute.
@abbradar abbradar changed the title boot tests: restore Perl code injection boot tests: don't use globbing Jul 22, 2019
@abbradar
Copy link
Member Author

Second version of this patch - we now just don't use globbing at all and instead find .iso using .isoName property.

@abbradar
Copy link
Member Author

I ran all boot tests locally again for the second version, but just to be sure let's test two of them on ofborg too.

@GrahamcOfBorg test boot.uefiCdrom.x86_64-linux boot.uefiNetboot.x86_64-linux

@abbradar
Copy link
Member Author

Tests pass both locally and on ofborg. Merging.

@abbradar abbradar merged commit 5f4288d into NixOS:master Jul 22, 2019
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.

None yet
1 participant
@abbradar