srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 21:43:08 +00:00
Code Issues Releases Activity

Don't install updates on support server if versions don't match

Browse Source 
I caught a few failed support_server update tests which failed
because packages from the update weren't installed; they weren't
installed because the update was for F28, but the support server
runs on an F29 disk image. Obviously we should skip the 'install
packages from the update' step in the support_server test unless
the versions match.

Arguably we could *never* install updates in support_server, but
I think it's actually valuable to know if the update breaks
support_server if we *are* on the right version.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-02-07 10:37:04 -08:00
parent 578a254cca
commit a20ea59961
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.pm
View File

@ -276,9 +276,13 @@ sub load_postinstall_tests() {
# are checking that an installer image built from the update works and do # are checking that an installer image built from the update works and do
# not install the update themselves in this manner # not install the update themselves in this manner
if (get_var("ADVISORY_OR_TASK") && !get_var("UPGRADE") && !get_var("INSTALL")) { if (get_var("ADVISORY_OR_TASK") && !get_var("UPGRADE") && !get_var("INSTALL")) {
autotest::loadtest "tests/_advisory_update.pm"; # don't try and install updates on the support server unless the
# now load the early boot tests again, as _advisory_update reboots # update is for the same release as the support server disk image
_load_early_postinstall_tests(2); if (get_var("TEST") ne "support_server" || get_var("VERSION") eq get_var("CURRREL")) {
autotest::loadtest "tests/_advisory_update.pm";
# now load the early boot tests again, as _advisory_update reboots
_load_early_postinstall_tests(2);
}
} }
# from now on, we have fully installed and booted system with root/specified user logged in # from now on, we have fully installed and booted system with root/specified user logged in
@ -321,7 +325,11 @@ sub load_postinstall_tests() {
# do this for INSTALL test(s); these are checking that an installer image # do this for INSTALL test(s); these are checking that an installer image
# built from the update works and do not install the update themselves. # built from the update works and do not install the update themselves.
if (get_var("ADVISORY_OR_TASK") && !get_var("INSTALL")) { if (get_var("ADVISORY_OR_TASK") && !get_var("INSTALL")) {
autotest::loadtest "tests/_advisory_post.pm"; # don't try and install updates on the support server unless the
# update is for the same release as the support server disk image
if (get_var("TEST") ne "support_server" || get_var("VERSION") eq get_var("CURRREL")) {
autotest::loadtest "tests/_advisory_post.pm";
}
} }
# we should shut down before uploading disk images # we should shut down before uploading disk images