From 8c76fa8458655ca3e0e34ff97f4b7e26503a9879 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 27 Apr 2020 12:55:34 -0700 Subject: [PATCH] Work around #1811234 for update upgrade tests This is failing on every update and that's not telling us anything useful - we already know about the bug - so let's work around it. Not adding a softfail as it's a bit more awkward to do that. Signed-off-by: Adam Williamson --- tests/upgrade_run.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm index d46b5a34..373d920d 100644 --- a/tests/upgrade_run.pm +++ b/tests/upgrade_run.pm @@ -21,6 +21,12 @@ sub run { $params .= " --nogpgcheck"; } + # FIXME workaround for #1811234 affecting F30 -> F31 upgrades + # remove when bug is fixed or F30 goes EOL + if (get_var("UPGRADE") && $relnum eq "31" && get_var("CURRREL") eq "30") { + assert_script_run "dnf -y module reset maven", 120; + } + if (script_run "dnf ${params} system-upgrade download", 6000) { record_soft_failure "dnf failed so retry with --allowerasing"; $params .= " --allowerasing";