From 7741dec76c5189de2107e9195b0da775c32ee33f Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 18 Aug 2026 09:55:09 +0200 Subject: [PATCH 1/2] CI: output server logs on error to make debugging our acceptance tests easier, we output the server journal + log on error. Signed-off-by: Tim Meusel --- acceptance/teardown/common/099_Archive_Logs.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/acceptance/teardown/common/099_Archive_Logs.rb b/acceptance/teardown/common/099_Archive_Logs.rb index d940e2bea2..5002f6b7f9 100644 --- a/acceptance/teardown/common/099_Archive_Logs.rb +++ b/acceptance/teardown/common/099_Archive_Logs.rb @@ -54,6 +54,17 @@ def file_glob(host, path) fi GREP_FOR_ALERTS + role_names = Array(host[:roles]).map(&:to_s) + is_master = role_names.include?('master') || role_names.include?('primary') || host == master + if is_master + on(host, <<~PUPPETSERVER_LOGS) + echo '--- puppetserver journal ---' + journalctl --unit puppetserver --boot --no-pager + echo '--- puppetserver log ---' + tail -n 200 /var/log/puppetlabs/puppetserver/puppetserver.log + PUPPETSERVER_LOGS + end + step("Archiving logs for #{host} into #{archive_name} (muzzling everything but :warn or higher beaker logs...)") do ## turn the logger off to avoid getting hundreds of lines of scp progress output previous_level = @logger.log_level From 21f9dbd37864489867f6308ca593486a1175ced3 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 18 Aug 2026 20:15:42 +0200 Subject: [PATCH 2/2] CI: dont backup PXP data --- acceptance/teardown/common/099_Archive_Logs.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/acceptance/teardown/common/099_Archive_Logs.rb b/acceptance/teardown/common/099_Archive_Logs.rb index 5002f6b7f9..2566722cdd 100644 --- a/acceptance/teardown/common/099_Archive_Logs.rb +++ b/acceptance/teardown/common/099_Archive_Logs.rb @@ -70,7 +70,6 @@ def file_glob(host, path) previous_level = @logger.log_level @logger.log_level = :warn - pxp_cache = '/opt/puppetlabs/pxp-agent/spool' puppetlabs_data = '/etc/puppetlabs' version_lookup_result = on(host, "cat /opt/puppetlabs/puppet/VERSION", :accept_all_exit_codes => true) @@ -81,7 +80,6 @@ def file_glob(host, path) # want to proceed... if version_lookup_result.exit_code == 0 agent_version = version_lookup_result.output.strip - archive_file_from(host, pxp_cache, {}, archive_root, archive_name) unless version_is_less(agent_version, "1.3.2") archive_file_from(host, puppetlabs_data, {}, archive_root, archive_name) archive_file_from(host, puppetlabs_logdir, {}, archive_root, archive_name) end