From 733d682cc3ed32c4b6325b8acffefa32a58ddb70 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 May 2021 02:28:31 +0000 Subject: [PATCH] nixos/release: add amazonImageAutomaticSize This allows us to continue to have the automatically sized image attempt to build on Hydra, which should give us a good indication of when we've got this fixed. --- nixos/release.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/release.nix b/nixos/release.nix index 87382f42f50..746e4c9dc69 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -224,6 +224,25 @@ in rec { ); + # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test + # automatic sizing without blocking the channel. + amazonImageAutomaticSize = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/ec2/amazon-image.nix + ({ ... }: { amazonImage.sizeMB = "auto"; }) + ]; + }).config.system.build.amazonImage) + + ); + + # Ensure that all packages used by the minimal NixOS config end up in the channel. dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix {