From f70416c6a13a453d97c882e9567b0868f03e12e7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 4 Jan 2018 18:34:20 -0800 Subject: [PATCH] Use release number not "rawhide" for Rawhide upgrades (#1531356) There's a problem with using `--releasever=rawhide` for upgrade tests ATM - see #1531356 . To avoid this, we'll try using the real Rawhide release number (which I'm adapting the scheduler code to discover and pass in as `RAWREL`). Signed-off-by: Adam Williamson --- tests/upgrade_run.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm index 9f7e12af..101d3daf 100644 --- a/tests/upgrade_run.pm +++ b/tests/upgrade_run.pm @@ -6,12 +6,16 @@ use utils; sub run { my $self = shift; my $release = lc(get_var("VERSION")); + my $relnum = $release; + if ($release eq "rawhide") { + $relnum = get_var("RAWREL", "rawhide"); + } # disable screen blanking (download can take a long time) script_run "setterm -blank 0"; # use compose repo repo_setup(); - my $params = "-y --releasever=${release}"; + my $params = "-y --releasever=${relnum}"; if ($release eq "rawhide") { $params .= " --nogpgcheck"; }