Commit 4d15fb3a authored by Adam Joseph's avatar Adam Joseph
Browse files

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.
parent f5a26bdc

nixos/tests/installer.nix

+3 −3
Original line number Diff line number Diff line
@@ -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")