diff options
| author | Antoine Eiche <lewo@abesis.fr> | 2019-02-08 09:20:40 +0100 |
|---|---|---|
| committer | Antoine Eiche <lewo@abesis.fr> | 2019-02-11 20:58:45 +0100 |
| commit | ff310146870a130477a4fe47e5f53bfe2a77bc74 (patch) | |
| tree | 6d859b19e3251c1a2196ac4b20e0d4e55ad63e7d /nixos | |
| parent | 933da6de9110ca208a82fb31a6730cbe9d971600 (diff) | |
| download | nixpkgs-ff310146870a130477a4fe47e5f53bfe2a77bc74.tar nixpkgs-ff310146870a130477a4fe47e5f53bfe2a77bc74.tar.gz nixpkgs-ff310146870a130477a4fe47e5f53bfe2a77bc74.tar.bz2 nixpkgs-ff310146870a130477a4fe47e5f53bfe2a77bc74.tar.lz nixpkgs-ff310146870a130477a4fe47e5f53bfe2a77bc74.tar.xz nixpkgs-ff310146870a130477a4fe47e5f53bfe2a77bc74.tar.zst nixpkgs-ff310146870a130477a4fe47e5f53bfe2a77bc74.zip | |
nixos/tests/ec2: reuse ssh keys from ssh-keys.nix
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/common/ec2.nix | 12 | ||||
| -rw-r--r-- | nixos/tests/ec2.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/openstack-image.nix | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index 99a39473b61..1e69b63191a 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -46,16 +46,4 @@ with pkgs.lib; ${script} ''; }; - - snakeOilPrivateKey = '' - -----BEGIN OPENSSH PRIVATE KEY----- - b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW - QyNTUxOQAAACDEPmwZv5dDPrMUaq0dDP+6eBTTe+QNrz14KBEIdhHd1QAAAJDufJ4S7nye - EgAAAAtzc2gtZWQyNTUxOQAAACDEPmwZv5dDPrMUaq0dDP+6eBTTe+QNrz14KBEIdhHd1Q - AAAECgwbDlYATM5/jypuptb0GF/+zWZcJfoVIFBG3LQeRyGsQ+bBm/l0M+sxRqrR0M/7p4 - FNN75A2vPXgoEQh2Ed3VAAAADEVDMiB0ZXN0IGtleQE= - -----END OPENSSH PRIVATE KEY----- - ''; - - snakeOilPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQ+bBm/l0M+sxRqrR0M/7p4FNN75A2vPXgoEQh2Ed3V EC2 test key"; } diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index db959a63e40..384fce67c22 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -41,6 +41,10 @@ let ]; }).config.system.build.amazonImage; + sshKeys = import ./ssh-keys.nix pkgs; + snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; + snakeOilPublicKey = sshKeys.snakeOilPublicKey; + in { boot-ec2-nixops = makeEc2Test { name = "nixops-userdata"; diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix index c7b28126e50..d0225016ab7 100644 --- a/nixos/tests/openstack-image.nix +++ b/nixos/tests/openstack-image.nix @@ -19,6 +19,10 @@ let ]; }).config.system.build.openstackImage; + sshKeys = import ./ssh-keys.nix pkgs; + snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; + snakeOilPublicKey = sshKeys.snakeOilPublicKey; + in { metadata = makeEc2Test { name = "openstack-ec2-metadata"; |