diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-15 13:34:41 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-15 14:15:12 +0100 |
commit | 5cc7bcda3023b01bd926eccd0c5f095a050c5ab0 (patch) | |
tree | e8c235650551ca5bd2df714b090aa5ad297c1951 /nixos/release.nix | |
parent | 84f33c6edccae85d419639010fba9f6c7c8c7dfd (diff) |
Combine OVA generation steps
Previously this was done in three derivations (one to build the raw
disk image, one to convert to OVA, one to add a hydra-build-products
file). Now it's done in one step to reduce the amount of copying
to/from S3. In particular, not uploading the raw disk image prevents
us from hitting hydra-queue-runner's size limit of 2 GiB.
Diffstat (limited to 'nixos/release.nix')
-rw-r--r-- | nixos/release.nix | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 101f68a43f7b..b697ba4c5032 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -150,31 +150,13 @@ in rec { with import nixpkgs { inherit system; }; - let - - config = (import lib/eval-config.nix { - inherit system; - modules = - [ versionModule - ./modules/installer/virtualbox-demo.nix - ]; - }).config; - - in - # Declare the OVA as a build product so that it shows up in Hydra. - hydraJob (runCommand "nixos-ova-${config.system.nixosVersion}-${system}" - { meta = { - description = "NixOS VirtualBox appliance (${system})"; - maintainers = maintainers.eelco; - }; - ova = config.system.build.virtualBoxOVA; - preferLocalBuild = true; - } - '' - mkdir -p $out/nix-support - fn=$(echo $ova/*.ova) - echo "file ova $fn" >> $out/nix-support/hydra-build-products - '') # */ + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ versionModule + ./modules/installer/virtualbox-demo.nix + ]; + }).config.system.build.virtualBoxOVA) ); |