diff options
| author | Florian Klink <flokli@flokli.de> | 2020-02-03 18:17:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 18:17:02 +0100 |
| commit | 136c0e4249bb31dd2911994765e5af152be24543 (patch) | |
| tree | 21757ba62ba232021ccf9433a4ff6e2ea15d7d83 /nixos | |
| parent | f16019c58fe7948f947cdc4d73464d82fb69300d (diff) | |
| parent | 6e40a8e484c64c6a48674d36602b43625fde9821 (diff) | |
Merge pull request #79141 from thefloweringash/openstack-tests
nixos/tests/openstack-image: add stdenv to image for nixos-rebuild
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/all-tests.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/openstack-image.nix | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e9440a4ebb719..17f36265c51a4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -213,8 +213,7 @@ in openldap = handleTest ./openldap.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; openssh = handleTest ./openssh.nix {}; - # openstack-image-userdata doesn't work in a sandbox as the simulated openstack instance needs network access - #openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; + openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix index 8a21dd1b599e0..97c9137fe1d67 100644 --- a/nixos/tests/openstack-image.nix +++ b/nixos/tests/openstack-image.nix @@ -16,6 +16,12 @@ let ../maintainers/scripts/openstack/openstack-image.nix ../modules/testing/test-instrumentation.nix ../modules/profiles/qemu-guest.nix + { + # Needed by nixos-rebuild due to lack of network access. + system.extraDependencies = with pkgs; [ + stdenv + ]; + } ]; }).config.system.build.openstackImage + "/nixos.qcow2"; |