From 234f103c4420c3a8b84d6ab9f6d37c74b58134f6 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 14 Aug 2024 16:47:01 -0400
Subject: [PATCH] Tweak dnf log uploads in upgrade_run for dnf5-only systems

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 tests/upgrade_run.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm
index d4cbf9d1..da518364 100644
--- a/tests/upgrade_run.pm
+++ b/tests/upgrade_run.pm
@@ -21,8 +21,9 @@ sub run {
         assert_script_run "dnf ${params} system-upgrade download", 6000;
     }
 
-    upload_logs "/var/log/dnf.log";
-    upload_logs "/var/log/dnf.rpm.log";
+    upload_logs "/var/log/dnf.log", failok => 1;
+    upload_logs "/var/log/dnf5.log", failok => 1;
+    upload_logs "/var/log/dnf.rpm.log", failok => 1;
 
     script_run "dnf system-upgrade reboot", 0;
     # fail immediately if we see a DNF error message, but keep an eye