git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79141 from thefloweringash/openstack-tests

nixos/tests/openstack-image: add stdenv to image for nixos-rebuild

commit136c0e4249bb31dd2911994765e5af152be24543 authorFlorian Klink <flokli@flokli.de> dateMon 3 Feb 2020, 18:17 (7 years ago) parentf16019c6e40a8e
2 files changed+7−2
nixos/tests/all-tests.nix+1−2 nixos/tests/openstack-image.nix+6
nixos/tests/all-tests.nix+1−2
@@ -213,8 +213,7 @@ in
213213 openldap = handleTest ./openldap.nix {};
214214 opensmtpd = handleTest ./opensmtpd.nix {};
215215 openssh = handleTest ./openssh.nix {};
216− # openstack-image-userdata doesn't work in a sandbox as the simulated openstack instance needs network access
217− #openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
216+ openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
218217 openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
219218 orangefs = handleTest ./orangefs.nix {};
220219 os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
nixos/tests/openstack-image.nix+6
@@ -16,6 +16,12 @@ let
1616 ../maintainers/scripts/openstack/openstack-image.nix
1717 ../modules/testing/test-instrumentation.nix
1818 ../modules/profiles/qemu-guest.nix
19+ {
20+ # Needed by nixos-rebuild due to lack of network access.
21+ system.extraDependencies = with pkgs; [
22+ stdenv
23+ ];
24+ }
1925 ];
2026 }).config.system.build.openstackImage + "/nixos.qcow2";
2127