diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-02-13 20:12:11 -0800 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-03-09 00:58:26 -0800 |
| commit | 4d15fb3ade85275b6a1404644ef339b7fdd713e4 (patch) | |
| tree | 65faff34f60e42ab164ab973058c40456506515d /nixos/tests/installer.nix | |
| parent | f5a26bdc42c48c786d4e7167ab92a200ffaad7f8 (diff) | |
nixos/tests/installer.nix: fix hydra eval
Hydra Eval has been throwing these eval errors for the past four months, which makes the yellow "Eval Errors" bubble pretty useless: https://hydra.nixos.org/eval/1790611#tabs-errors ``` in job ‘nixos.tests.installer.separateBoot.aarch64-linux’: error: Non-EFI boot methods are only supported on i686 / x86_64 in job ‘nixos.tests.installer.simple.aarch64-linux’: error: Non-EFI boot methods are only supported on i686 / x86_64 in job ‘nixos.tests.installer.lvm.aarch64-linux’: error: Non-EFI boot methods are only supported on i686 / x86_64 ``` This PR moves the failure for the `!isEfi && !pkgs.stdenv.hostPlatform.isx86` case from eval-time to runtime, so the failure gets categorized under the test that produced it, rather than just being lumped in to the catch-all Eval Errors pile which... apparently nobody cares about.
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3adfa979edcc7..d441765fe194d 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -77,9 +77,9 @@ let let iface = if grubVersion == 1 then "ide" else "virtio"; isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd"; - in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then - throw "Non-EFI boot methods are only supported on i686 / x86_64" - else '' + in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then '' + machine.succeed("true") + '' else '' def assemble_qemu_flags(): flags = "-cpu max" ${if (system == "x86_64-linux" || system == "i686-linux") |