From cead194b2a6489e4b4ffba84b5cc43eda1ed72b5 Mon Sep 17 00:00:00 2001 From: atlas Date: Thu, 19 Nov 2026 11:39:38 +0100 Subject: [PATCH] vm-tests: every test's globalTimeout stays under the one-hour job limit full-setup 7200 -> 2400, semi-spread 10800 -> 3000, and 1800 on the four tests that used the driver's one-hour default. The runner kills a job at one hour and reports nothing, so a longer test timeout could never fire. --- nix/vm-tests/agent-ephemeral-rootfs.nix | 3 +++ nix/vm-tests/full-setup.nix | 5 +++-- nix/vm-tests/hive-egress-antispoof.nix | 3 +++ nix/vm-tests/hive-squid.nix | 3 +++ nix/vm-tests/semi-spread.nix | 4 +++- nix/vm-tests/swarm-archive.nix | 3 +++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/nix/vm-tests/agent-ephemeral-rootfs.nix b/nix/vm-tests/agent-ephemeral-rootfs.nix index 58e1abc93..f8b04f2c7 100644 --- a/nix/vm-tests/agent-ephemeral-rootfs.nix +++ b/nix/vm-tests/agent-ephemeral-rootfs.nix @@ -95,6 +95,9 @@ in pkgs.testers.runNixOSTest { name = "agent-ephemeral-rootfs"; + # Without this the driver allows an hour, the runner's whole job limit. + globalTimeout = 1800; + nodes.host = { pkgs, ... }: { diff --git a/nix/vm-tests/full-setup.nix b/nix/vm-tests/full-setup.nix index 6744c1fa2..86466e6cb 100644 --- a/nix/vm-tests/full-setup.nix +++ b/nix/vm-tests/full-setup.nix @@ -62,8 +62,9 @@ let name = "full-setup"; # Boot of fourteen containers and the setup steps, with the waits' own - # bounds well inside. - globalTimeout = 7200; + # bounds well inside. Below the runner's one-hour job limit, which also + # covers the build before the test starts. + globalTimeout = 2400; nodes.machine = { config, ... }: diff --git a/nix/vm-tests/hive-egress-antispoof.nix b/nix/vm-tests/hive-egress-antispoof.nix index 374e5f220..a8510a9d6 100644 --- a/nix/vm-tests/hive-egress-antispoof.nix +++ b/nix/vm-tests/hive-egress-antispoof.nix @@ -110,6 +110,9 @@ in pkgs.testers.runNixOSTest { name = "hive-egress-antispoof"; + # Without this the driver allows an hour, the runner's whole job limit. + globalTimeout = 1800; + nodes.host = { config, lib, ... }: { diff --git a/nix/vm-tests/hive-squid.nix b/nix/vm-tests/hive-squid.nix index 7f592e4db..e3bf35d73 100644 --- a/nix/vm-tests/hive-squid.nix +++ b/nix/vm-tests/hive-squid.nix @@ -130,6 +130,9 @@ in pkgs.testers.runNixOSTest { name = "hive-squid"; + # Without this the driver allows an hour, the runner's whole job limit. + globalTimeout = 1800; + nodes = { proxy = { lib, pkgs, ... }: diff --git a/nix/vm-tests/semi-spread.nix b/nix/vm-tests/semi-spread.nix index 645dd13cc..ae5d517b7 100644 --- a/nix/vm-tests/semi-spread.nix +++ b/nix/vm-tests/semi-spread.nix @@ -653,7 +653,9 @@ pkgs.testers.runNixOSTest ( name = "semi-spread"; # Three hosts' boots, the setup ceremony and the agents' build and pull. - globalTimeout = 10800; + # Below the runner's one-hour job limit, which also covers the build + # before the test starts. + globalTimeout = 3000; nodes.swarm = { config, ... }: diff --git a/nix/vm-tests/swarm-archive.nix b/nix/vm-tests/swarm-archive.nix index 7c6ab5f0d..a0372069c 100644 --- a/nix/vm-tests/swarm-archive.nix +++ b/nix/vm-tests/swarm-archive.nix @@ -202,6 +202,9 @@ in pkgs.testers.runNixOSTest { name = "swarm-archive"; + # Without this the driver allows an hour, the runner's whole job limit. + globalTimeout = 1800; + nodes.machine = archiveNode { }; nodes.s3archive = archiveNode {