diff mbox

[KVM-AUTOTEST,05/12] KVM test: specify installation cdkeys in a dedicated file

Message ID 9d4ca96f1445db6df176825a494d6504a3bddeba.1249257056.git.mgoldish@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michael Goldish Aug. 2, 2009, 11:58 p.m. UTC 
- Add file kvm_cdkeys.cfg.sample which specifies cdkeys for guests that require
  them.  Users should rename the file to kvm_cdkeys.cfg and enter the real
  cdkeys in the file.

- Remove all cdkey lines from kvm_tests.cfg.sample and add an include statement
  instead ('include kvm_cdkeys.cfg').

Signed-off-by: Michael Goldish <mgoldish@redhat.com>
---
 client/tests/kvm/kvm_cdkeys.cfg.sample |   16 ++++++++++++++++
 client/tests/kvm/kvm_tests.cfg.sample  |   10 +++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 client/tests/kvm/kvm_cdkeys.cfg.sample

Comments

Lucas Meneghel Rodrigues Aug. 5, 2009, 12:15 p.m. UTC | #1 
On Sun, Aug 2, 2009 at 8:58 PM, Michael Goldish<mgoldish@redhat.com> wrote:
> - Add file kvm_cdkeys.cfg.sample which specifies cdkeys for guests that require
>  them.  Users should rename the file to kvm_cdkeys.cfg and enter the real
>  cdkeys in the file.
>
> - Remove all cdkey lines from kvm_tests.cfg.sample and add an include statement
>  instead ('include kvm_cdkeys.cfg').

Talking about this one, I like the idea of separating the cd keys, and
it's my understanding the configuration snippets can be moved inside
the control file so one can more comfortably add it from the web
interface in the future. Also, the unattended install test will
implement answer file templating, which will allow for comfortable
replacement of those keys once without requiring user intervention.

> Signed-off-by: Michael Goldish <mgoldish@redhat.com>
> ---
>  client/tests/kvm/kvm_cdkeys.cfg.sample |   16 ++++++++++++++++
>  client/tests/kvm/kvm_tests.cfg.sample  |   10 +++-------
>  2 files changed, 19 insertions(+), 7 deletions(-)
>  create mode 100644 client/tests/kvm/kvm_cdkeys.cfg.sample
>
> diff --git a/client/tests/kvm/kvm_cdkeys.cfg.sample b/client/tests/kvm/kvm_cdkeys.cfg.sample
> new file mode 100644
> index 0000000..60bfe59
> --- /dev/null
> +++ b/client/tests/kvm/kvm_cdkeys.cfg.sample
> @@ -0,0 +1,16 @@
> +# Rename this file to kvm_cdkeys.cfg.
> +# Replace the 'CDKEY' strings with real cdkeys where necessary.
> +# Guests that do not require cdkeys by default are commented out.
> +# You may uncomment them if necessary.
> +
> +RHEL.5.3.i386: cdkey = CDKEY
> +RHEL.5.3.x86_64: cdkey = CDKEY
> +Win2000: cdkey = CDKEY
> +WinXP.32: cdkey = CDKEY
> +WinXP.64: cdkey = CDKEY
> +Win2003.32: cdkey = CDKEY
> +Win2003.64: cdkey = CDKEY
> +#WinVista.32: cdkey = CDKEY
> +#WinVista.64: cdkey = CDKEY
> +#Win2008.32: cdkey = CDKEY
> +#Win2008.64: cdkey = CDKEY
> diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
> index 4b9d7eb..3c23432 100644
> --- a/client/tests/kvm/kvm_tests.cfg.sample
> +++ b/client/tests/kvm/kvm_tests.cfg.sample
> @@ -272,7 +272,6 @@ variants:
>                         image_name = rhel5-32
>                         install:
>                             steps=RHEL-5.3-i386.steps
> -                            cdkey=RHEL_INSTALL_NUMBER
>                             cdrom=linux/RHEL-5.3-i386-DVD.iso
>                             md5sum=371c62851611fd32ead440df6f24a296
>                             md5sum_1m=242318dd44152210f6ff6cdda1bfbf51
> @@ -282,7 +281,6 @@ variants:
>                         image_name = rhel5-64
>                         install:
>                             steps=RHEL-5.3-x86_64.steps
> -                            cdkey=RHEL_INSTALL_NUMBER
>                             cdrom=linux/RHEL-5.3-x86_64-DVD.iso
>                             md5sum=c5ed6b284410f4d8212cafc78fd7a8c5
>                             md5sum_1m=b999f437583098ea5bbd56fb1de1d011
> @@ -363,7 +361,6 @@ variants:
>                     md5sum = dda6039f3a9173f0f6bfae40f5efdfea
>                     md5sum_1m = dd28fba196d366d56fe774bd93df5527
>                     user = user
> -                    cdkey = WIN_2000_32_CDKEY
>                 setup:
>                     steps = Win2000-32-setupssh.steps
>                     cdrom = windows/setupssh.iso
> @@ -376,7 +373,6 @@ variants:
>                     md5sum = 743450644b1d9fe97b3cf379e22dceb0
>                     md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
>                     user = user
> -                    cdkey = WIN_XP_32_CDKEY
>                 setup:
>                     steps = WinXP-32-setupssh.steps
>                     cdrom = windows/setupssh.iso
> @@ -390,7 +386,6 @@ variants:
>                     md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
>                     md5sum_1m = e812363ff427effc512b7801ee70e513
>                     user = user
> -                    cdkey = WIN_XP_64_CDKEY
>
>             - Win2003:
>                 image_size = 20G
> @@ -406,7 +401,6 @@ variants:
>                             md5sum = 03e921e9b4214773c21a39f5c3f42ef7
>                             md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3
>                             user = user
> -                            cdkey = WIN_2003_32_CDKEY
>                         setup:
>                             steps = Win2003-32-setupssh.steps
>                             cdrom = windows/setupssh.iso
> @@ -420,7 +414,6 @@ variants:
>                             md5sum = 5703f87c9fd77d28c05ffadd3354dbbd
>                             md5sum_1m = 439393c384116aa09e08a0ad047dcea8
>                             user = user
> -                            cdkey = WIN_2003_64_CDKEY
>
>             - WinVista:
>                 only install
> @@ -624,5 +617,8 @@ variants:
>         only rtl8139
>
>
> +include kvm_cdkeys.cfg
> +
> +
>  # Choose your test list
>  only fc8_quick
> --
> 1.5.4.1
>
> _______________________________________________
> Autotest mailing list
> Autotest@test.kernel.org
> http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
>
Michael Goldish Aug. 5, 2009, 2:02 p.m. UTC | #2 
----- "Lucas Meneghel Rodrigues" <lmr@redhat.com> wrote:

> On Sun, Aug 2, 2009 at 8:58 PM, Michael Goldish<mgoldish@redhat.com>
> wrote:
> > - Add file kvm_cdkeys.cfg.sample which specifies cdkeys for guests
> that require
> >  them.  Users should rename the file to kvm_cdkeys.cfg and enter the
> real
> >  cdkeys in the file.
> >
> > - Remove all cdkey lines from kvm_tests.cfg.sample and add an
> include statement
> >  instead ('include kvm_cdkeys.cfg').
> 
> Talking about this one, I like the idea of separating the cd keys,
> and it's my understanding the configuration snippets can be moved inside
> the control file so one can more comfortably add it from the web
> interface in the future. Also, the unattended install test will
> implement answer file templating, which will allow for comfortable
> replacement of those keys once without requiring user intervention.

Does that mean you like the patch?  Or do you need more time to review it?

The ability to modify the configuration in the control file isn't very
relevant to the cdkeys because we probably don't want to specify cdkeys
in the control file.

> > Signed-off-by: Michael Goldish <mgoldish@redhat.com>
> > ---
> >  client/tests/kvm/kvm_cdkeys.cfg.sample |   16 ++++++++++++++++
> >  client/tests/kvm/kvm_tests.cfg.sample  |   10 +++-------
> >  2 files changed, 19 insertions(+), 7 deletions(-)
> >  create mode 100644 client/tests/kvm/kvm_cdkeys.cfg.sample
> >
> > diff --git a/client/tests/kvm/kvm_cdkeys.cfg.sample
> b/client/tests/kvm/kvm_cdkeys.cfg.sample
> > new file mode 100644
> > index 0000000..60bfe59
> > --- /dev/null
> > +++ b/client/tests/kvm/kvm_cdkeys.cfg.sample
> > @@ -0,0 +1,16 @@
> > +# Rename this file to kvm_cdkeys.cfg.
> > +# Replace the 'CDKEY' strings with real cdkeys where necessary.
> > +# Guests that do not require cdkeys by default are commented out.
> > +# You may uncomment them if necessary.
> > +
> > +RHEL.5.3.i386: cdkey = CDKEY
> > +RHEL.5.3.x86_64: cdkey = CDKEY
> > +Win2000: cdkey = CDKEY
> > +WinXP.32: cdkey = CDKEY
> > +WinXP.64: cdkey = CDKEY
> > +Win2003.32: cdkey = CDKEY
> > +Win2003.64: cdkey = CDKEY
> > +#WinVista.32: cdkey = CDKEY
> > +#WinVista.64: cdkey = CDKEY
> > +#Win2008.32: cdkey = CDKEY
> > +#Win2008.64: cdkey = CDKEY
> > diff --git a/client/tests/kvm/kvm_tests.cfg.sample
> b/client/tests/kvm/kvm_tests.cfg.sample
> > index 4b9d7eb..3c23432 100644
> > --- a/client/tests/kvm/kvm_tests.cfg.sample
> > +++ b/client/tests/kvm/kvm_tests.cfg.sample
> > @@ -272,7 +272,6 @@ variants:
> >                         image_name = rhel5-32
> >                         install:
> >                             steps=RHEL-5.3-i386.steps
> > -                            cdkey=RHEL_INSTALL_NUMBER
> >                             cdrom=linux/RHEL-5.3-i386-DVD.iso
> >                             md5sum=371c62851611fd32ead440df6f24a296
> >                            
> md5sum_1m=242318dd44152210f6ff6cdda1bfbf51
> > @@ -282,7 +281,6 @@ variants:
> >                         image_name = rhel5-64
> >                         install:
> >                             steps=RHEL-5.3-x86_64.steps
> > -                            cdkey=RHEL_INSTALL_NUMBER
> >                             cdrom=linux/RHEL-5.3-x86_64-DVD.iso
> >                             md5sum=c5ed6b284410f4d8212cafc78fd7a8c5
> >                            
> md5sum_1m=b999f437583098ea5bbd56fb1de1d011
> > @@ -363,7 +361,6 @@ variants:
> >                     md5sum = dda6039f3a9173f0f6bfae40f5efdfea
> >                     md5sum_1m = dd28fba196d366d56fe774bd93df5527
> >                     user = user
> > -                    cdkey = WIN_2000_32_CDKEY
> >                 setup:
> >                     steps = Win2000-32-setupssh.steps
> >                     cdrom = windows/setupssh.iso
> > @@ -376,7 +373,6 @@ variants:
> >                     md5sum = 743450644b1d9fe97b3cf379e22dceb0
> >                     md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
> >                     user = user
> > -                    cdkey = WIN_XP_32_CDKEY
> >                 setup:
> >                     steps = WinXP-32-setupssh.steps
> >                     cdrom = windows/setupssh.iso
> > @@ -390,7 +386,6 @@ variants:
> >                     md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
> >                     md5sum_1m = e812363ff427effc512b7801ee70e513
> >                     user = user
> > -                    cdkey = WIN_XP_64_CDKEY
> >
> >             - Win2003:
> >                 image_size = 20G
> > @@ -406,7 +401,6 @@ variants:
> >                             md5sum =
> 03e921e9b4214773c21a39f5c3f42ef7
> >                             md5sum_1m =
> 37c2fdec15ac4ec16aa10fdfdb338aa3
> >                             user = user
> > -                            cdkey = WIN_2003_32_CDKEY
> >                         setup:
> >                             steps = Win2003-32-setupssh.steps
> >                             cdrom = windows/setupssh.iso
> > @@ -420,7 +414,6 @@ variants:
> >                             md5sum =
> 5703f87c9fd77d28c05ffadd3354dbbd
> >                             md5sum_1m =
> 439393c384116aa09e08a0ad047dcea8
> >                             user = user
> > -                            cdkey = WIN_2003_64_CDKEY
> >
> >             - WinVista:
> >                 only install
> > @@ -624,5 +617,8 @@ variants:
> >         only rtl8139
> >
> >
> > +include kvm_cdkeys.cfg
> > +
> > +
> >  # Choose your test list
> >  only fc8_quick
> > --
> > 1.5.4.1
> >
> > _______________________________________________
> > Autotest mailing list
> > Autotest@test.kernel.org
> > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
> >
> 
> 
> 
> -- 
> Lucas Meneghel
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/client/tests/kvm/kvm_cdkeys.cfg.sample b/client/tests/kvm/kvm_cdkeys.cfg.sample
new file mode 100644
index 0000000..60bfe59
--- /dev/null
+++ b/client/tests/kvm/kvm_cdkeys.cfg.sample
@@ -0,0 +1,16 @@ 
+# Rename this file to kvm_cdkeys.cfg.
+# Replace the 'CDKEY' strings with real cdkeys where necessary.
+# Guests that do not require cdkeys by default are commented out.
+# You may uncomment them if necessary.
+
+RHEL.5.3.i386: cdkey = CDKEY
+RHEL.5.3.x86_64: cdkey = CDKEY
+Win2000: cdkey = CDKEY
+WinXP.32: cdkey = CDKEY
+WinXP.64: cdkey = CDKEY
+Win2003.32: cdkey = CDKEY
+Win2003.64: cdkey = CDKEY
+#WinVista.32: cdkey = CDKEY
+#WinVista.64: cdkey = CDKEY
+#Win2008.32: cdkey = CDKEY
+#Win2008.64: cdkey = CDKEY
diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index 4b9d7eb..3c23432 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -272,7 +272,6 @@  variants:
                         image_name = rhel5-32
                         install:
                             steps=RHEL-5.3-i386.steps
-                            cdkey=RHEL_INSTALL_NUMBER
                             cdrom=linux/RHEL-5.3-i386-DVD.iso
                             md5sum=371c62851611fd32ead440df6f24a296
                             md5sum_1m=242318dd44152210f6ff6cdda1bfbf51
@@ -282,7 +281,6 @@  variants:
                         image_name = rhel5-64
                         install:
                             steps=RHEL-5.3-x86_64.steps
-                            cdkey=RHEL_INSTALL_NUMBER
                             cdrom=linux/RHEL-5.3-x86_64-DVD.iso
                             md5sum=c5ed6b284410f4d8212cafc78fd7a8c5
                             md5sum_1m=b999f437583098ea5bbd56fb1de1d011
@@ -363,7 +361,6 @@  variants:
                     md5sum = dda6039f3a9173f0f6bfae40f5efdfea
                     md5sum_1m = dd28fba196d366d56fe774bd93df5527
                     user = user
-                    cdkey = WIN_2000_32_CDKEY
                 setup:
                     steps = Win2000-32-setupssh.steps
                     cdrom = windows/setupssh.iso
@@ -376,7 +373,6 @@  variants:
                     md5sum = 743450644b1d9fe97b3cf379e22dceb0
                     md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
                     user = user
-                    cdkey = WIN_XP_32_CDKEY
                 setup:
                     steps = WinXP-32-setupssh.steps
                     cdrom = windows/setupssh.iso
@@ -390,7 +386,6 @@  variants:
                     md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
                     md5sum_1m = e812363ff427effc512b7801ee70e513
                     user = user
-                    cdkey = WIN_XP_64_CDKEY
 
             - Win2003:
                 image_size = 20G
@@ -406,7 +401,6 @@  variants:
                             md5sum = 03e921e9b4214773c21a39f5c3f42ef7
                             md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3
                             user = user
-                            cdkey = WIN_2003_32_CDKEY
                         setup:
                             steps = Win2003-32-setupssh.steps
                             cdrom = windows/setupssh.iso
@@ -420,7 +414,6 @@  variants:
                             md5sum = 5703f87c9fd77d28c05ffadd3354dbbd
                             md5sum_1m = 439393c384116aa09e08a0ad047dcea8
                             user = user
-                            cdkey = WIN_2003_64_CDKEY
 
             - WinVista:
                 only install
@@ -624,5 +617,8 @@  variants:
         only rtl8139
 
 
+include kvm_cdkeys.cfg
+
+
 # Choose your test list
 only fc8_quick