public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121352 from lukegb/debug-hydra 

amazonImage: make statically sized again
This commit is contained in:
Luke Granger-Brown 2021-05-01 04:06:34 +01:00 committed by GitHub
parent 168f7a1dcf 733d682cc3
commit c58f60b41b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/maintainers/scripts/ec2/amazon-image.nix
View File

@ -41,7 +41,7 @@ in {
sizeMB = mkOption { sizeMB = mkOption {
type = with types; either (enum [ "auto" ]) int; type = with types; either (enum [ "auto" ]) int;
default = "auto"; default = if config.ec2.hvm then 2048 else 8192;
example = 8192; example = 8192;
description = "The size in MB of the image"; description = "The size in MB of the image";
}; };

19
nixos/release.nix
View File

@ -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. # Ensure that all packages used by the minimal NixOS config end up in the channel.
dummy = forAllSystems (system: pkgs.runCommand "dummy" dummy = forAllSystems (system: pkgs.runCommand "dummy"
{ toplevel = (import lib/eval-config.nix { { toplevel = (import lib/eval-config.nix {