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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-04-27 12:55:34 -07:00
parent 41aed12b16
commit 8c76fa8458

View File

@ -21,6 +21,12 @@ sub run {
$params .= " --nogpgcheck"; $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) { if (script_run "dnf ${params} system-upgrade download", 6000) {
record_soft_failure "dnf failed so retry with --allowerasing"; record_soft_failure "dnf failed so retry with --allowerasing";
$params .= " --allowerasing"; $params .= " --allowerasing";