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/ec2: return to passing state #77570

Merged
merged 1 commit into from Jan 27, 2020
Merged

nixos/tests/ec2: return to passing state #77570

merged 1 commit into from Jan 27, 2020

Conversation

thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Jan 12, 2020 •
edited

Updates required:

  • Use vpc image format (new default, supported by Amazon)
  • Pass full image filename to makeEc2Test
  • Increase memory allocation for nixos-rebuild
  • Set a networking.hostName for services.httpd
  • Add appropriate escaping in literal userdata

While I'm here, try to make it fail fast.

Motivation for this change

Fixes #77312

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.

@thefloweringash
nixos/tests/ec2: return to passing state
e4fa819 
Updates required:

- Use vpc image format (new default, supported by Amazon)
- Pass full image filename to makeEc2Test
- Increase memory allocation for nixos-rebuild
- Set a networking.hostName for services.httpd
- Add appropriate escaping in literal userdata

While I'm here, try to make it fail fast.
@tfc
Copy link
Contributor

tfc commented Jan 26, 2020

cc @flokli @worldofpeace

plz merge, this unblocks the python port

@thefloweringash are you maybe interested in doing the python port, too?

@worldofpeace worldofpeace merged commit 92c91c0 into NixOS:master Jan 27, 2020
@flokli
Copy link
Contributor

flokli commented Jan 27, 2020 via email

@thefloweringash
Copy link
Member Author

This looks a bit scary to me, would have preferred for this to be in two separate PRs... Did you verify the EC2 stuff still works? Also wonder about the images spitted out by hydra...

This PR is only updating tests. The EC2 changes that broke the tests, including the default image type changing, were part of #62042.

@thefloweringash thefloweringash deleted the nixos-tests-ec2 branch January 28, 2020 03:00
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.

nixosTests.ec2: Don't work
4 participants
@thefloweringash @tfc @flokli @worldofpeace