diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /nixos/tests/common/ec2.nix | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'nixos/tests/common/ec2.nix')
| -rw-r--r-- | nixos/tests/common/ec2.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index 502fe96231f..52d0310ac72 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -3,7 +3,7 @@ with pkgs.lib; { - makeEc2Test = { name, image, userData, script, hostname ? "ec2-instance", sshPublicKey ? null }: + makeEc2Test = { name, image, userData, script, hostname ? "ec2-instance", sshPublicKey ? null, meta ? {} }: let metaData = pkgs.stdenv.mkDerivation { name = "metadata"; @@ -59,5 +59,7 @@ with pkgs.lib; machine = create_machine({"startCommand": start_command}) '' + script; + + inherit meta; }; } |