mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-12 01:44:21 +00:00
Don't load _advisory_update when START_AFTER_TEST is set
This should always be safe (in the four cases where it's set, the previous test will have set up the advisory repo), and saves us a reboot. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
6e9213f4b7
commit
ffab8bce75
8
main.pm
8
main.pm
@ -295,9 +295,11 @@ sub load_postinstall_tests() {
|
|||||||
# install the updates to be tested). Don't do this for UPGRADE tests, as
|
# install the updates to be tested). Don't do this for UPGRADE tests, as
|
||||||
# the update gets installed as part of the upgrade in that case and we
|
# the update gets installed as part of the upgrade in that case and we
|
||||||
# don't need the extra reboot. Don't do this for INSTALL test(s); these
|
# don't need the extra reboot. Don't do this for INSTALL test(s); these
|
||||||
# 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
|
||||||
# not install the update themselves in this manner
|
# packages from the update should have been installed as part of the
|
||||||
if (get_var("ADVISORY_OR_TASK") && !get_var("UPGRADE") && !get_var("INSTALL")) {
|
# install process. Don't do this for START_AFTER_TEST tests, as there we
|
||||||
|
# presume the previous test already did this, and it saves a reboot.
|
||||||
|
if (get_var("ADVISORY_OR_TASK") && !get_var("UPGRADE") && !get_var("INSTALL") && !get_var("START_AFTER_TEST")) {
|
||||||
autotest::loadtest "tests/_advisory_update.pm";
|
autotest::loadtest "tests/_advisory_update.pm";
|
||||||
# now load the early boot tests again, as _advisory_update reboots
|
# now load the early boot tests again, as _advisory_update reboots
|
||||||
_load_early_postinstall_tests(2);
|
_load_early_postinstall_tests(2);
|
||||||
|
Loading…
Reference in New Issue
Block a user