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

Merged
merged 1 commit into from Jan 27, 2020

Conversation

@thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Jan 12, 2020

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.
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.
@thefloweringash thefloweringash force-pushed the thefloweringash:nixos-tests-ec2 branch from 6d4dc4c to e4fa819 Jan 13, 2020
@tfc
Copy link
Contributor

@tfc 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
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@flokli
Copy link
Contributor

@flokli flokli commented Jan 27, 2020

@thefloweringash
Copy link
Member Author

@thefloweringash thefloweringash commented Jan 28, 2020

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 thefloweringash:nixos-tests-ec2 branch Jan 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.