----- "Lucas Meneghel Rodrigues" <lmr@xxxxxxxxxx> wrote: > If we are going unattended install, make sure the step based > setup doesn't run, as the unattended install procedure > already takes care of guest setup. > > Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx> > --- > client/tests/kvm/tests.cfg.sample | 2 +- > client/tests/kvm/tests_base.cfg.sample | 16 +++++++++------- > 2 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/client/tests/kvm/tests.cfg.sample > b/client/tests/kvm/tests.cfg.sample > index c6a66a4..72a5d76 100644 > --- a/client/tests/kvm/tests.cfg.sample > +++ b/client/tests/kvm/tests.cfg.sample > @@ -60,7 +60,7 @@ variants: > only WinXP.32 > no install setup > no hugepages > - only unattended_install setup boot shutdown > + only unattended_install boot shutdown > only rtl8139 > - @fc11_kickstart: > only qemu-kvm > diff --git a/client/tests/kvm/tests_base.cfg.sample > b/client/tests/kvm/tests_base.cfg.sample > index 0ab7823..15d137f 100644 > --- a/client/tests/kvm/tests_base.cfg.sample > +++ b/client/tests/kvm/tests_base.cfg.sample > @@ -53,8 +53,17 @@ variants: > kill_vm_timeout = 60 > kill_vm_timeout_on_error = 0 > > + - setup: install > + type = steps > + fail_if_stuck_for = 300 > + stuck_detection_history = 2does > + kill_vm_on_error = yes > + keep_screendump_history = yes > + > - unattended_install: > type = unattended_install > + # Unattended install also perform guest setup, so setup is > not needed > + no setup This line isn't going to have any effect, because there's no 'setup' in unattended_install anyway, because unattended_install inherits everything defined _before_ the current variants block, which I think is just some global defaults. In other words, unattended_install is separate from 'setup', it doesn't contain it. In order to prevent 'setup' from running before/after unattended_install we should modify the relevant test sets in tests.cfg (which is what the first part of this patch does). > kill_vm_on_error = yes > force_create_image = yes > pre_command = scripts/unattended.py > @@ -62,13 +71,6 @@ variants: > extra_params += " -boot d" > nic_mode = user > > - - setup: install unattended_install > - type = steps > - fail_if_stuck_for = 300 > - stuck_detection_history = 2 > - kill_vm_on_error = yes > - keep_screendump_history = yes > - > - boot: install setup unattended_install > type = boot > kill_vm_on_error = yes > -- > 1.6.5.2 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
