(PE-42079) Add timeout for puppet run on db targets

davidmalloncares · davidmalloncares · commit b645f2c6be2c · 2025-10-16T11:09:57.000+01:00
diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml
@@ -44,6 +44,8 @@ jobs:
         exclude:
           - version: 2021.7.9
             version_to_upgrade: 2021.7.9
+          - version: 2021.7.9
+            version_to_upgrade: 2025.6.0
           - version: 2023.8.6
             version_to_upgrade: 2021.7.9
           - version: 2023.8.6
diff --git a/plans/subplans/install.pp b/plans/subplans/install.pp
@@ -429,7 +429,7 @@
     run_task('peadm::puppet_runonce', $target)
   }
 
-  wait([$bg_db_run])
+  wait([$bg_db_run], 1200, _catch_errors => true)
 
   # 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

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@`
`429`	`429`	`run_task('peadm::puppet_runonce', $target)`
`430`	`430`	`}`
`431`	`431`
`432`		`- wait([$bg_db_run])`
	`432`	`+ wait([$bg_db_run], 1200, _catch_errors => true)`
`433`	`433`
`434`	`434`	`# The puppetserver might be in the middle of a restart after the Puppet run,`
`435`	`435`	`# so we check the status by calling the api and ensuring the puppetserver is`