From 1859491609d879b9403273684fb0aa41e980f283 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 30 Oct 2023 13:40:20 +0100 Subject: [PATCH] tests: add 5 minutes default timeout By default, it is one hour but our CI cannot handle that many VM tests, so we switch to 5 minutes default timeouts. --- nix/tests/lanzaboote.nix | 2 ++ nix/tests/stub.nix | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/nix/tests/lanzaboote.nix b/nix/tests/lanzaboote.nix index 3599e79..f6e0ceb 100644 --- a/nix/tests/lanzaboote.nix +++ b/nix/tests/lanzaboote.nix @@ -4,6 +4,7 @@ let inherit (pkgs) lib system; + defaultTimeout = 5 * 60; # = 5 minutes mkSecureBootTest = { name, machine ? { }, useSecureBoot ? true, useTPM2 ? false, readEfiVariables ? false, testScript }: let @@ -79,6 +80,7 @@ let in pkgs.nixosTest { inherit name; + globalTimeout = defaultTimeout; testScript = '' ${lib.optionalString useTPM2 tpm2Initialization} diff --git a/nix/tests/stub.nix b/nix/tests/stub.nix index ee44b3f..f3faa94 100644 --- a/nix/tests/stub.nix +++ b/nix/tests/stub.nix @@ -1,6 +1,7 @@ { pkgs, runTest, ukiModule }: let + defaultTimeout = 5 * 60; # = 5 minutes common = _: { imports = [ ukiModule ]; @@ -21,6 +22,8 @@ in # this test fails something is very wrong. systemd-stub = runTest { name = "systemd-stub"; + globalTimeout = defaultTimeout; + nodes.machine = _: { imports = [ common ]; boot.loader.uki.stub = "${pkgs.systemd}/lib/systemd/boot/efi/linuxx64.efi.stub"; @@ -33,6 +36,8 @@ in fatStub = runTest { name = "fat-stub"; + globalTimeout = defaultTimeout; + nodes.machine = _: { imports = [ common ]; };