Fix upgrade workaround stuff for upgrade_2

Initial implementation wasn't correct, I forgot CURRREL is not
'the pre-upgrade release version' but just 'the current stable
release'. This is a dumb way to figure out the correct release
number for this context but off-hand I can't think of a better
one.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-03-12 09:30:51 -07:00
parent ff1d75050e
commit 55a2229e4c
1 changed files with 6 additions and 0 deletions

View File

@ -7,6 +7,12 @@ sub run {
my $self = shift;
# upgrader should be installed on up-to-date system
my $version = get_var("CURRREL");
# ok this is dumb but I need to fix it fast and can't think of a
# better way in a hurry. We want the pre-upgrade release version.
my $testname = get_var("TEST");
if (index($testname, "upgrade_2") != -1) {
$version = get_var("PREVREL");
}
setup_workaround_repo $version;
assert_script_run 'dnf -y update --refresh', 1800;
script_run "reboot", 0;