Merge pull request #79141 from thefloweringash/openstack-tests
nixos/tests/openstack-image: add stdenv to image for nixos-rebuild
This commit is contained in:
commit
136c0e4249
@ -213,8 +213,7 @@ in
|
|||||||
openldap = handleTest ./openldap.nix {};
|
openldap = handleTest ./openldap.nix {};
|
||||||
opensmtpd = handleTest ./opensmtpd.nix {};
|
opensmtpd = handleTest ./opensmtpd.nix {};
|
||||||
openssh = handleTest ./openssh.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 {};
|
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
|
||||||
orangefs = handleTest ./orangefs.nix {};
|
orangefs = handleTest ./orangefs.nix {};
|
||||||
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
|
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
|
||||||
|
@ -16,6 +16,12 @@ let
|
|||||||
../maintainers/scripts/openstack/openstack-image.nix
|
../maintainers/scripts/openstack/openstack-image.nix
|
||||||
../modules/testing/test-instrumentation.nix
|
../modules/testing/test-instrumentation.nix
|
||||||
../modules/profiles/qemu-guest.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";
|
}).config.system.build.openstackImage + "/nixos.qcow2";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user