1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-22 10:23:09 +00:00

We should *not* check CURRREL for rolekit in _check

...because by this point in the upgrade test, the system is
upgraded, and rolekit won't be there on F29+.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-07-10 16:21:54 -07:00
parent 7e7016ea14
commit 5999058d07

View File

@ -12,8 +12,6 @@ sub run {
# always, for F29+ we decommission directly ourselves as rolekit # always, for F29+ we decommission directly ourselves as rolekit
# is deprecated # is deprecated
my $version = get_var("VERSION"); my $version = get_var("VERSION");
# for upgrade tests we need to check CURRREL not VERSION
$version = get_var("CURRREL") if (get_var("UPGRADE"));
if ($version < 29 && $version ne 'Rawhide') { if ($version < 29 && $version ne 'Rawhide') {
# check the role status, should be 'running' # check the role status, should be 'running'
validate_script_output 'rolectl status domaincontroller/domain.local', sub { $_ =~ m/^running/ }; validate_script_output 'rolectl status domaincontroller/domain.local', sub { $_ =~ m/^running/ };