From c41c55cefe5e4389fa0fba6e17365e0ec554cdf7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 26 Apr 2022 16:08:57 -0700 Subject: [PATCH] Handle Rawhide updates in upgrade postinstall version check When testing Rawhide updates we set VERSION to the Rawhide release number, not "Rawhide". This post-upgrade version check needs adjusting to handle that. Signed-off-by: Adam Williamson --- tests/upgrade_postinstall.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/upgrade_postinstall.pm b/tests/upgrade_postinstall.pm index 2c74a608..ed1d3f00 100644 --- a/tests/upgrade_postinstall.pm +++ b/tests/upgrade_postinstall.pm @@ -7,7 +7,12 @@ sub run { my $self = shift; # try to login, check whether target release is installed $self->root_console(tty=>3); - check_release(lc(get_var('VERSION'))); + my $version = lc(get_var('VERSION')); + my $rawrel = get_var('RAWREL'); + # if VERSION is the Rawhide release number (happens for Rawhide + # update tests), check for "rawhide" not the number + my $tocheck = $version eq $rawrel ? 'rawhide' : $version; + check_release($tocheck); }