pyrox.dev
Quick hack to reduce Hydra memory consumption
+19
-17
nixos/release.nix
+19
-17
nixos/release.nix
···
11
11
12
12
forAllSystems = pkgs.lib.genAttrs supportedSystems;
13
13
14
-
callTest = fn: args: forAllSystems (system: import fn ({ inherit system; } // args));
14
+
scrubDrv = drv: let res = { inherit (drv) drvPath outPath type name; outputName = "out"; out = res; }; in res;
15
+
16
+
callTest = fn: args: forAllSystems (system: scrubDrv (import fn ({ inherit system; } // args)));
15
17
16
18
pkgs = import nixpkgs { system = "x86_64-linux"; };
17
19
···
40
42
41
43
in
42
44
# Declare the ISO as a build product so that it shows up in Hydra.
43
-
runCommand "nixos-iso-${config.system.nixosVersion}"
45
+
scrubDrv (runCommand "nixos-iso-${config.system.nixosVersion}"
44
46
{ meta = {
45
47
description = "NixOS installation CD (${description}) - ISO image for ${system}";
46
48
maintainers = map (x: lib.getAttr x lib.maintainers) maintainers;
···
51
53
''
52
54
mkdir -p $out/nix-support
53
55
echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
54
-
''; # */
56
+
''); # */
55
57
56
58
57
59
makeSystemTarball =
···
78
80
};
79
81
80
82
81
-
makeClosure = module: forAllSystems (system: (import ./lib/eval-config.nix {
83
+
makeClosure = module: forAllSystems (system: scrubDrv (import ./lib/eval-config.nix {
82
84
inherit system;
83
85
modules = [ module ] ++ lib.singleton
84
86
({ config, lib, ... }:
···
171
173
172
174
in
173
175
# Declare the OVA as a build product so that it shows up in Hydra.
174
-
runCommand "nixos-ova-${config.system.nixosVersion}-${system}"
176
+
scrubDrv (runCommand "nixos-ova-${config.system.nixosVersion}-${system}"
175
177
{ meta = {
176
178
description = "NixOS VirtualBox appliance (${system})";
177
179
maintainers = lib.maintainers.eelco;
···
182
184
mkdir -p $out/nix-support
183
185
fn=$(echo $ova/*.ova)
184
186
echo "file ova $fn" >> $out/nix-support/hydra-build-products
185
-
'' # */
187
+
'') # */
186
188
187
189
);
188
190
···
222
224
tests.firefox = callTest tests/firefox.nix {};
223
225
tests.firewall = callTest tests/firewall.nix {};
224
226
tests.gnome3 = callTest tests/gnome3.nix {};
225
-
tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test);
226
-
tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test);
227
-
tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test);
228
-
tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
229
-
tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
230
-
tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
231
-
tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test);
232
-
tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test);
233
-
tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test);
234
-
tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
235
-
tests.installer.btrfsSubvolDefault = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test);
227
+
tests.installer.efi = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).efi.test);
228
+
tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test);
229
+
tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test);
230
+
tests.installer.rebuildCD = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).rebuildCD.test);
231
+
tests.installer.separateBoot = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).separateBoot.test);
232
+
tests.installer.simple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simple.test);
233
+
tests.installer.simpleLabels = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleLabels.test);
234
+
tests.installer.simpleProvided = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleProvided.test);
235
+
tests.installer.btrfsSimple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSimple.test);
236
+
tests.installer.btrfsSubvols = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
237
+
tests.installer.btrfsSubvolDefault = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test);
236
238
tests.influxdb = callTest tests/influxdb.nix {};
237
239
tests.ipv6 = callTest tests/ipv6.nix {};
238
240
tests.jenkins = callTest tests/jenkins.nix {};