From 500cb649d164ceda02bd8d96909d1644d33e9119 Mon Sep 17 00:00:00 2001 From: David Mallon Date: Thu, 18 Sep 2025 09:16:24 +0100 Subject: [PATCH 1/3] (MAINT) try test timeout --- plans/subplans/install.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plans/subplans/install.pp b/plans/subplans/install.pp index 96af47f0d..1fc486a68 100644 --- a/plans/subplans/install.pp +++ b/plans/subplans/install.pp @@ -429,7 +429,8 @@ run_task('peadm::puppet_runonce', $target) } - wait([$bg_db_run]) + # add a timeout to wait + wait([$bg_db_run], '_timeout' => 1200) # The puppetserver might be in the middle of a restart after the Puppet run, # so we check the status by calling the api and ensuring the puppetserver is From fd013b010c29ecbf55f719e6cc93bbc7e7e7b2aa Mon Sep 17 00:00:00 2001 From: David Mallon Date: Thu, 18 Sep 2025 12:31:34 +0100 Subject: [PATCH 2/3] (MAINT) alter timeouts --- plans/subplans/install.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/subplans/install.pp b/plans/subplans/install.pp index 1fc486a68..4ef3d17d1 100644 --- a/plans/subplans/install.pp +++ b/plans/subplans/install.pp @@ -407,7 +407,7 @@ ) $bg_db_run = background('database-targets') || { - run_task('peadm::puppet_runonce', $database_targets) + run_task('peadm::puppet_runonce', $database_targets, timeout => 900) } parallelize($agent_installer_targets) |$target| { @@ -430,7 +430,7 @@ } # add a timeout to wait - wait([$bg_db_run], '_timeout' => 1200) + wait([$bg_db_run], 1200) # The puppetserver might be in the middle of a restart after the Puppet run, # so we check the status by calling the api and ensuring the puppetserver is From 83242402dbeb8252720ffbd348f02a5deaa22d89 Mon Sep 17 00:00:00 2001 From: David Mallon Date: Thu, 18 Sep 2025 15:51:38 +0100 Subject: [PATCH 3/3] (MAINT) alter timeouts2 --- plans/subplans/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/subplans/install.pp b/plans/subplans/install.pp index 4ef3d17d1..822dc9a87 100644 --- a/plans/subplans/install.pp +++ b/plans/subplans/install.pp @@ -407,7 +407,7 @@ ) $bg_db_run = background('database-targets') || { - run_task('peadm::puppet_runonce', $database_targets, timeout => 900) + run_task('peadm::puppet_runonce', $database_targets) } parallelize($agent_installer_targets) |$target| {