[PATCH V4 00/12] OSSTest: OVMF test job

[PATCH V4 00/12] OSSTest: OVMF test job

[Wei Liu]

This series implements a basic test job for OVMF guest. The test case will
install an OVMF guest and try to boot it.

With some more refactoring this series is several patches more than the
last round. Lots of code is extracted from ts-redhat-install and put
into TestSupport.pm. I don't have necessary setup to run
ts-redhat-install, but ts-debian-hvm-install passes a run so I assume my
refactoring correct and won't break ts-redhat-install.

This series was tested with OSSTest standalone mode:
 $ sg-run-job build-amd64
 $ OSSTEST_HOST_REUSE=1 sg-run-job build-amd64-pvops
 $ JOBNAME=standalone ts-debain-hvm-install host=cam-st12

Wei.

Changes in v4:
* rebase on top of master branch
* ditch genisoimage and switch to xorriso
* factor out even more common code

Changes in v3:
* consolidate more config items into preseed_base
* ts-ovmf-debian-install -> ts-debian-hvm-install
* factor out functions to create ISOs.
* $xl -> $toolstack in test case script

Changes in v2:
* factor out preseed_base
* make installation CD work with seabios

Wei Liu (12):
  TestSupport.pm: add bios option to guest config file
  TestSupport.pm: introduce create_iso_xorriso for creating isos
  TestSupport.pm: move rewrite_config_nocd to support library
  TestSupport.pm: introduce guest_create
  ts-redhat-install: use $flight, $job and $gn when creating iso
  TestSupport.pm: introduce create_empty_iso
  TestSupport.pm: introduce iso_gen_flags_basic
  TestSupport.pm: introduce copy_iso_content_to_dir
  Debian.pm: factor out preseed_base
  Introduce ts-debian-hvm-install
  sg-run-job: OVMF job
  make-flight: OVMF test flight

 Osstest/Debian.pm      |  143 ++++++++++++++++++++-----------------
 Osstest/TestSupport.pm |   80 ++++++++++++++++++++-
 make-flight            |   13 ++++
 sg-run-job             |    6 ++
 ts-debian-hvm-install  |  183 ++++++++++++++++++++++++++++++++++++++++++++++++
 ts-redhat-install      |   54 +++-----------
 6 files changed, 371 insertions(+), 108 deletions(-)
 create mode 100755 ts-debian-hvm-install

-- 
1.7.10.4

[PATCH V4 01/12] TestSupport.pm: add bios option to guest config file

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index a513540..ebe313c 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1442,6 +1442,11 @@ END
         $cfg .= "device_model_version='$devmodel'\n";
     }
 
+    my $bios = $xopts{'Bios'};
+    if (defined $bios) {
+        $cfg .= "bios='$bios'\n";
+    }
+
     my $cfgpath= prepareguest_part_xencfg($ho, $gho, $ram_mb, \%xopts, $cfg);
     target_cmd_root($ho, <<END);
         (echo $passwd; echo $passwd) | vncpasswd $gho->{Guest}.vncpw
-- 
1.7.10.4

[PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos

[Wei Liu]

... and convert ts-redhat-install to make use of it.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/TestSupport.pm |   15 +++++++++++++++
 ts-redhat-install      |   15 +++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index ebe313c..228389c 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -97,6 +97,8 @@ BEGIN {
                       await_webspace_fetch_byleaf create_webfile
                       file_link_contents get_timeout
                       setup_pxeboot setup_pxeboot_local host_pxefile
+
+                      create_iso_xorriso
                       );
     %EXPORT_TAGS = ( );
 
@@ -1859,4 +1861,17 @@ default local
 END
 }
 
+#---------- ISO images ----------
+sub create_iso_xorriso ($$$$;@) {
+    my ($ho,$iso,$dir,$isotimeout,@xopts) = @_;
+
+    target_install_packages_norec($ho, qw(xorriso));
+
+    target_cmd_root($ho, <<END, 60);
+        mkdir -p $dir
+        xorriso @xopts -o $iso $dir/.
+END
+
+}
+
 1;
diff --git a/ts-redhat-install b/ts-redhat-install
index a945033..1a81ec9 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -112,7 +112,7 @@ END
 our $emptyiso= '/root/empty.iso';
 
 sub prep () {
-    target_install_packages_norec($ho, qw(lvm2 rsync genisoimage));
+    target_install_packages_norec($ho, qw(lvm2 rsync));
 
     my $isotimeout= 600;
 
@@ -123,18 +123,15 @@ sub prep () {
     my $newiso= '/root/newiso';
     my $emptydir= '/root/empty-dir';
 
-    my @isogen_base= qw(-R -J -T);
+    my @isogen_base= qw(-as mkisofs -R -J);
     my @isogen_boot= qw(-b isolinux/isolinux.bin
                         -c isolinux/boot.cat
                         -no-emul-boot
                         -boot-load-size 4
                         -boot-info-table);
+    my @isogen= (@isogen_base, @isogen_boot);
 
-    target_cmd_root($ho, <<END, 60);
-            set -e
-            mkdir -p $emptydir
-            genisoimage -o $emptyiso @isogen_base $emptydir/.
-END
+    create_iso_xorriso($ho, $emptyiso, $emptydir, 60, @isogen_base);
 
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
@@ -163,9 +160,7 @@ END
         target_putfilecontents_root_stash($ho, 10, kickstart(),
                                           "$newiso/ks.cfg");
 
-        target_cmd_root($ho, <<END, $isotimeout);
-            genisoimage -o $gho->{Rimage} @isogen_base @isogen_boot $newiso/.
-END
+        create_iso_xorriso($ho, $gho->{Rimage}, $newiso, $isotimeout, @isogen);
     });
 }
 
-- 
1.7.10.4

Re: [PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos

[Ian Jackson]

Wei Liu writes ("[PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos"):
> ... and convert ts-redhat-install to make use of it.

Thanks:

> +
> +                      create_iso_xorriso

Why the additional blank line ?

> +#---------- ISO images ----------
> +sub create_iso_xorriso ($$$$;@) {
> +    my ($ho,$iso,$dir,$isotimeout,@xopts) = @_;
> +
> +    target_install_packages_norec($ho, qw(xorriso));

You (sadly) mustn't put this here because multiple simultaneous
executions of this function on the same host might cause multiple
simultaneous invocations of apt on the same host, which would fail due
to apt's locking.

> -    my @isogen_base= qw(-R -J -T);
> +    my @isogen_base= qw(-as mkisofs -R -J);

I haven't checked these xorriso options; I'll take your word for them.

Thanks,
Ian.

Re: [PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos

[Wei Liu]

On Wed, Apr 02, 2014 at 05:01:00PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos"):
> > ... and convert ts-redhat-install to make use of it.
> 
> Thanks:
> 
> > +
> > +                      create_iso_xorriso
> 
> Why the additional blank line ?
> 

To separate this function from other category. More functions will come.

I will also rename this function to iso_* according to your suggestion
on later patch.

> > +#---------- ISO images ----------
> > +sub create_iso_xorriso ($$$$;@) {
> > +    my ($ho,$iso,$dir,$isotimeout,@xopts) = @_;
> > +
> > +    target_install_packages_norec($ho, qw(xorriso));
> 
> You (sadly) mustn't put this here because multiple simultaneous
> executions of this function on the same host might cause multiple
> simultaneous invocations of apt on the same host, which would fail due
> to apt's locking.
> 

OK.

> > -    my @isogen_base= qw(-R -J -T);
> > +    my @isogen_base= qw(-as mkisofs -R -J);
> 
> I haven't checked these xorriso options; I'll take your word for them.
> 

For genisoimage:
-R     Generate SUSP and RR records using the Rock Ridge protocol to
       further describe the files on the ISO9660 filesystem.
-J     Generate Joliet directory records in addition to regular ISO9660
       filenames.
-T     Generate  a  file  TRANS.TBL  in each directory on the CD-ROM,
       which can be used on non-Rock Ridge-capable systems to
       help establish the correct filenames.

For xorriso with mkisofs personality:
-R    same as above (taken from man 8 mkisofs)
-J    same as above (taken from man 8 mkisofs)
-T    same as above, but will be ignored by xorriso

Wei.

> Thanks,
> Ian.

Re: [PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos

[Ian Jackson]

Wei Liu writes ("Re: [PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos"):
> On Wed, Apr 02, 2014 at 05:01:00PM +0100, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos"):
> > > ... and convert ts-redhat-install to make use of it.
> > 
> > Thanks:
> > 
> > > +
> > > +                      create_iso_xorriso
> > 
> > Why the additional blank line ?
> 
> To separate this function from other category. More functions will come.

Ah, OK.

> I will also rename this function to iso_* according to your suggestion
> on later patch.

Thanks.

> > > -    my @isogen_base= qw(-R -J -T);
> > > +    my @isogen_base= qw(-as mkisofs -R -J);
> > 
> > I haven't checked these xorriso options; I'll take your word for them.
> > 
> 
> For genisoimage:
> -R     Generate SUSP and RR records using the Rock Ridge protocol to
>        further describe the files on the ISO9660 filesystem.
> -J     Generate Joliet directory records in addition to regular ISO9660
>        filenames.
> -T     Generate  a  file  TRANS.TBL  in each directory on the CD-ROM,
>        which can be used on non-Rock Ridge-capable systems to
>        help establish the correct filenames.
> 
> For xorriso with mkisofs personality:
> -R    same as above (taken from man 8 mkisofs)
> -J    same as above (taken from man 8 mkisofs)
> -T    same as above, but will be ignored by xorriso

Great, thanks.

Ian.

[PATCH V4 03/12] TestSupport.pm: move rewrite_config_nocd to support library

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/TestSupport.pm |   11 +++++++++++
 ts-redhat-install      |   11 +----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 228389c..2a36d9d 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -99,6 +99,7 @@ BEGIN {
                       setup_pxeboot setup_pxeboot_local host_pxefile
 
                       create_iso_xorriso
+                      rewrite_config_nocd
                       );
     %EXPORT_TAGS = ( );
 
@@ -1874,4 +1875,14 @@ END
 
 }
 
+sub rewrite_config_nocd ($$$) {
+    my ($ho,$gho,$emptyiso) = @_;
+    guest_editconfig($ho, $gho, sub {
+        if (m/^\s*disk\s*\=/ .. /\]/) {
+            s/\Q$gho->{Rimage}\E/$emptyiso/;
+        }
+        s/^on_reboot.*/on_reboot='restart'/;
+    });
+}
+
 1;
diff --git a/ts-redhat-install b/ts-redhat-install
index 1a81ec9..c0f4e76 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -168,15 +168,6 @@ sub start () {
     target_cmd_root($ho, "$xl create $gho->{CfgPath}", 100);
 }
 
-sub rewrite_config_nocd () {
-    guest_editconfig($ho, $gho, sub {
-        if (m/^\s*disk\s*\=/ .. /\]/) {
-            s/\Q$gho->{Rimage}\E/$emptyiso/;
-        }
-        s/^on_reboot.*/on_reboot='restart'/;
-    });
-}
-
 if (!$stage) {
     prep();
     start();
@@ -188,7 +179,7 @@ if ($stage<2) {
     guest_destroy($ho,$gho);
 }
 
-rewrite_config_nocd();
+rewrite_config_nocd($ho,$gho,$emptyiso);
 start();
 guest_await_dhcp_tcp($gho,300);
 guest_check_up($gho);
-- 
1.7.10.4

Re: [PATCH V4 03/12] TestSupport.pm: move rewrite_config_nocd to support library

[Ian Jackson]

Wei Liu writes ("[PATCH V4 03/12] TestSupport.pm: move rewrite_config_nocd to support library"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

This should probably have a better name if it's going to be in there.
guest_blah_blah_something.  guest_editconfig_nocd perhaps ?  Unless
you have a better idea.

Also it can probably use $gho->{Host} rather than taking $ho
explicitly.

Thanks,
Ian.

Re: [PATCH V4 03/12] TestSupport.pm: move rewrite_config_nocd to support library

[Wei Liu]

On Wed, Apr 02, 2014 at 05:04:44PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH V4 03/12] TestSupport.pm: move rewrite_config_nocd to support library"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> 
> This should probably have a better name if it's going to be in there.
> guest_blah_blah_something.  guest_editconfig_nocd perhaps ?  Unless
> you have a better idea.
> 

OK.

> Also it can probably use $gho->{Host} rather than taking $ho
> explicitly.
> 

Done.

Wei.

> Thanks,
> Ian.

[PATCH V4 04/12] TestSupport.pm: introduce guest_create

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/TestSupport.pm |   10 ++++++++--
 ts-redhat-install      |    8 ++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 2a36d9d..df6c4c1 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -92,7 +92,7 @@ BEGIN {
                       guest_vncsnapshot_begin guest_vncsnapshot_stash
 		      guest_check_remus_ok guest_editconfig
                       host_involves_pcipassthrough host_get_pcipassthrough_devs
-                      toolstack
+                      toolstack guest_create
 
                       await_webspace_fetch_byleaf create_webfile
                       file_link_contents get_timeout
@@ -1219,7 +1219,13 @@ sub guest_await_reboot ($$$) {
 sub guest_destroy ($$) {
     my ($ho,$gho) = @_;
     target_cmd_root($ho, toolstack()->{Command}." destroy $gho->{Name}", 40);
-}    
+}
+
+sub guest_create ($$$) {
+    my ($ho,$gho,$toolstack) = @_;
+    target_cmd_root($ho, "$toolstack create $gho->{CfgPath}", 100);
+}
+
 
 sub target_choose_vg ($$) {
     my ($ho, $mbneeded) = @_;
diff --git a/ts-redhat-install b/ts-redhat-install
index c0f4e76..4cff729 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -164,13 +164,9 @@ END
     });
 }
 
-sub start () {
-    target_cmd_root($ho, "$xl create $gho->{CfgPath}", 100);
-}
-
 if (!$stage) {
     prep();
-    start();
+    guest_create($ho,$gho$xl);
 } else {
     $gho= selectguest($gn,$gho);
 }
@@ -180,6 +176,6 @@ if ($stage<2) {
 }
 
 rewrite_config_nocd($ho,$gho,$emptyiso);
-start();
+guest_create($ho,$gho,$xl);
 guest_await_dhcp_tcp($gho,300);
 guest_check_up($gho);
-- 
1.7.10.4

Re: [PATCH V4 04/12] TestSupport.pm: introduce guest_create

[Ian Jackson]

Wei Liu writes ("[PATCH V4 04/12] TestSupport.pm: introduce guest_create"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

> +sub guest_create ($$$) {
> +    my ($ho,$gho,$toolstack) = @_;
> +    target_cmd_root($ho, "$toolstack create $gho->{CfgPath}", 100);
> +}
> +

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Thanks,
Ian.

Re: [PATCH V4 04/12] TestSupport.pm: introduce guest_create

[Wei Liu]

On Wed, Apr 02, 2014 at 05:06:26PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH V4 04/12] TestSupport.pm: introduce guest_create"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> 
> > +sub guest_create ($$$) {
> > +    my ($ho,$gho,$toolstack) = @_;
> > +    target_cmd_root($ho, "$toolstack create $gho->{CfgPath}", 100);
> > +}
> > +
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 

Actually $ho can be replaced with $gho->{Host}, just as you suggested in
previous patch.

Since this is only mechanical change, I will retain your ack, if this is
OK.

Wei.

> Thanks,
> Ian.

Re: [PATCH V4 04/12] TestSupport.pm: introduce guest_create

[Ian Jackson]

Wei Liu writes ("Re: [PATCH V4 04/12] TestSupport.pm: introduce guest_create"):
> On Wed, Apr 02, 2014 at 05:06:26PM +0100, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH V4 04/12] TestSupport.pm: introduce guest_create"):
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > 
> > > +sub guest_create ($$$) {
> > > +    my ($ho,$gho,$toolstack) = @_;
> > > +    target_cmd_root($ho, "$toolstack create $gho->{CfgPath}", 100);
> > > +}
> > > +
> > 
> > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> Actually $ho can be replaced with $gho->{Host}, just as you suggested in
> previous patch.
> 
> Since this is only mechanical change, I will retain your ack, if this is
> OK.

Sure.

Ian.

[PATCH V4 05/12] ts-redhat-install: use $flight, $job and $gn when creating iso

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 ts-redhat-install |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts-redhat-install b/ts-redhat-install
index 4cff729..fb60caf 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -109,7 +109,7 @@ ENDKEYS
 END
 }
 
-our $emptyiso= '/root/empty.iso';
+our $emptyiso= '/root/$flight.$job.$gn-empty.iso';
 
 sub prep () {
     target_install_packages_norec($ho, qw(lvm2 rsync));
@@ -120,8 +120,8 @@ sub prep () {
                        $disk_mb + 1,
                        100);
 
-    my $newiso= '/root/newiso';
-    my $emptydir= '/root/empty-dir';
+    my $newiso= '/root/$flight.$job.$gn-newiso';
+    my $emptydir= '/root/$flight.$job.$gn-empty-dir';
 
     my @isogen_base= qw(-as mkisofs -R -J);
     my @isogen_boot= qw(-b isolinux/isolinux.bin
-- 
1.7.10.4

Re: [PATCH V4 05/12] ts-redhat-install: use $flight, $job and $gn when creating iso

[Ian Jackson]

Wei Liu writes ("[PATCH V4 05/12] ts-redhat-install: use $flight, $job and $gn when creating iso"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

[PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/TestSupport.pm |   15 +++++++++++++++
 ts-redhat-install      |   17 ++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index df6c4c1..a4a738f 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -99,6 +99,7 @@ BEGIN {
                       setup_pxeboot setup_pxeboot_local host_pxefile
 
                       create_iso_xorriso
+                      create_empty_iso
                       rewrite_config_nocd
                       );
     %EXPORT_TAGS = ( );
@@ -1881,6 +1882,20 @@ END
 
 }
 
+sub create_empty_iso($$$) {
+    my ($ho,$emptyiso,$emptydir) = @_;
+    my @isogen_opts= qw(-as mkisofs -R -J);
+
+    # Unfortunately xorriso refuses to create an ISO if the input
+    # directory is empty.
+    target_cmd_root($ho, <<END, 60);
+        mkdir -p $emptydir
+        echo empty > $emptydir/empty
+END
+
+    create_iso_xorriso($ho, $emptyiso, $emptydir, 60, @isogen_opts);
+}
+
 sub rewrite_config_nocd ($$$) {
     my ($ho,$gho,$emptyiso) = @_;
     guest_editconfig($ho, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index fb60caf..8b2b2f8 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -123,15 +123,14 @@ sub prep () {
     my $newiso= '/root/$flight.$job.$gn-newiso';
     my $emptydir= '/root/$flight.$job.$gn-empty-dir';
 
-    my @isogen_base= qw(-as mkisofs -R -J);
-    my @isogen_boot= qw(-b isolinux/isolinux.bin
-                        -c isolinux/boot.cat
-                        -no-emul-boot
-                        -boot-load-size 4
-                        -boot-info-table);
-    my @isogen= (@isogen_base, @isogen_boot);
-
-    create_iso_xorriso($ho, $emptyiso, $emptydir, 60, @isogen_base);
+    create_empty_iso($ho, $emptyiso, $emptydir);
+
+    my @isogen= qw(-as mkisofs -R -J
+                   -b isolinux/isolinux.bin
+                   -c isolinux/boot.cat
+                   -no-emul-boot
+                   -boot-load-size 4
+                   -boot-info-table);
 
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
-- 
1.7.10.4

Re: [PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso

[Ian Jackson]

Wei Liu writes ("[PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
...
> +sub create_empty_iso($$$) {
> +    my ($ho,$emptyiso,$emptydir) = @_;
> +    my @isogen_opts= qw(-as mkisofs -R -J);
> +
> +    # Unfortunately xorriso refuses to create an ISO if the input
> +    # directory is empty.

How annoying.

> +    target_cmd_root($ho, <<END, 60);
> +        mkdir -p $emptydir
> +        echo empty > $emptydir/empty
> +END

Isn't this a duplicate of the code in ts-redhat-install ?

Ian.

Re: [PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso

[Wei Liu]

On Wed, Apr 02, 2014 at 05:08:04PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ...
> > +sub create_empty_iso($$$) {
> > +    my ($ho,$emptyiso,$emptydir) = @_;
> > +    my @isogen_opts= qw(-as mkisofs -R -J);
> > +
> > +    # Unfortunately xorriso refuses to create an ISO if the input
> > +    # directory is empty.
> 
> How annoying.
> 

With the help of a Xorriso developer this problem is fixed.

> > +    target_cmd_root($ho, <<END, 60);
> > +        mkdir -p $emptydir
> > +        echo empty > $emptydir/empty
> > +END
> 
> Isn't this a duplicate of the code in ts-redhat-install ?
> 

This will be deleted in my next version.

Wei.

> Ian.

Re: [PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso

[Ian Jackson]

Wei Liu writes ("Re: [PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso"):
> On Wed, Apr 02, 2014 at 05:08:04PM +0100, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH V4 06/12] TestSupport.pm: introduce create_empty_is> > > +    # Unfortunately xorriso refuses to create an ISO if the input
> > > +    # directory is empty.
> > 
> > How annoying.
> 
> With the help of a Xorriso developer this problem is fixed.

Excellent.

> > > +    target_cmd_root($ho, <<END, 60);
> > > +        mkdir -p $emptydir
> > > +        echo empty > $emptydir/empty
> > > +END
> > 
> > Isn't this a duplicate of the code in ts-redhat-install ?
> 
> This will be deleted in my next version.

Great.

Thanks,
Ian.

[PATCH V4 07/12] TestSupport.pm: introduce iso_gen_flags_basic

[Wei Liu]

... which returns the flags that can be passed to xorriso to create a
bootable image (not EFI capable though).

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/TestSupport.pm |   10 ++++++++++
 ts-redhat-install      |    7 +------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index a4a738f..5bf9b85 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -100,6 +100,7 @@ BEGIN {
 
                       create_iso_xorriso
                       create_empty_iso
+                      iso_gen_flags_basic
                       rewrite_config_nocd
                       );
     %EXPORT_TAGS = ( );
@@ -1896,6 +1897,15 @@ END
     create_iso_xorriso($ho, $emptyiso, $emptydir, 60, @isogen_opts);
 }
 
+sub iso_gen_flags_basic() {
+    return qw(-as mkisofs -R -J
+              -b isolinux/isolinux.bin
+              -c isolinux/boot.cat
+              -no-emul-boot
+              -boot-load-size 4
+              -boot-info-table);
+}
+
 sub rewrite_config_nocd ($$$) {
     my ($ho,$gho,$emptyiso) = @_;
     guest_editconfig($ho, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index 8b2b2f8..386c9ce 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -125,12 +125,7 @@ sub prep () {
 
     create_empty_iso($ho, $emptyiso, $emptydir);
 
-    my @isogen= qw(-as mkisofs -R -J
-                   -b isolinux/isolinux.bin
-                   -c isolinux/boot.cat
-                   -no-emul-boot
-                   -boot-load-size 4
-                   -boot-info-table);
+    my @isogen= iso_gen_flags_basic();
 
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
-- 
1.7.10.4

Re: [PATCH V4 07/12] TestSupport.pm: introduce iso_gen_flags_basic

[Ian Jackson]

Wei Liu writes ("[PATCH V4 07/12] TestSupport.pm: introduce iso_gen_flags_basic"):
> ... which returns the flags that can be passed to xorriso to create a
> bootable image (not EFI capable though).
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

[PATCH V4 08/12] TestSupport.pm: introduce copy_iso_content_to_dir

[Wei Liu]

... which returns a string of commands to pass into target_cmd_root.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/TestSupport.pm |   14 ++++++++++++++
 ts-redhat-install      |   10 +---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 5bf9b85..3995562 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -101,6 +101,7 @@ BEGIN {
                       create_iso_xorriso
                       create_empty_iso
                       iso_gen_flags_basic
+                      copy_iso_content_to_dir
                       rewrite_config_nocd
                       );
     %EXPORT_TAGS = ( );
@@ -1906,6 +1907,19 @@ sub iso_gen_flags_basic() {
               -boot-info-table);
 }
 
+sub copy_iso_content_to_dir($$) {
+    my ($gho,$newiso) = @_;
+    return <<"END";
+            set -ex
+            umount /mnt ||:
+            rm -rf $newiso
+            mount -o loop -r $gho->{Rimage} /mnt
+            mkdir $newiso
+            cp -a /mnt/. $newiso/.
+            umount /mnt
+END
+}
+
 sub rewrite_config_nocd ($$$) {
     my ($ho,$gho,$emptyiso) = @_;
     guest_editconfig($ho, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index 386c9ce..3bcac5c 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -130,15 +130,7 @@ sub prep () {
     more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
                           OnReboot => 'preserve',
                           PostImageHook => sub {
-        target_cmd_root($ho, <<END, $isotimeout);
-            set -ex
-            umount /mnt ||:
-            rm -rf $newiso
-            mount -o loop -r $gho->{Rimage} /mnt
-            mkdir $newiso
-            cp -a /mnt/. $newiso/.
-            umount /mnt
-END
+        target_cmd_root($ho, copy_iso_content_to_dir($gho,$newiso), $isotimeout);
         target_editfile_root($ho, "$newiso/isolinux/isolinux.cfg", sub {
             while (<EI>) {
                 if (m/^\s+append/) {
-- 
1.7.10.4

Re: [PATCH V4 08/12] TestSupport.pm: introduce copy_iso_content_to_dir

[Ian Jackson]

Wei Liu writes ("[PATCH V4 08/12] TestSupport.pm: introduce copy_iso_content_to_dir"):
> ... which returns a string of commands to pass into target_cmd_root.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Although I'm starting to wonder about the names here:

>                        create_iso_xorriso
>                        create_empty_iso
>                        iso_gen_flags_basic
> +                      copy_iso_content_to_dir
>                        rewrite_config_nocd

Maybe some of these should be called   iso_create_xorriso
iso_create_empty  etc.

And maybe this one

> +sub copy_iso_content_to_dir($$) {
> +    my ($gho,$newiso) = @_;
> +    return <<"END";
> +            set -ex
> +            umount /mnt ||:
> +            rm -rf $newiso
> +            mount -o loop -r $gho->{Rimage} /mnt

should mention the word "image" in its name.  Eg
"iso_copy_content_from_image" or something.

Let me know what you think.

Thanks,
Ian.

Re: [PATCH V4 08/12] TestSupport.pm: introduce copy_iso_content_to_dir

[Wei Liu]

On Wed, Apr 02, 2014 at 05:10:52PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH V4 08/12] TestSupport.pm: introduce copy_iso_content_to_dir"):
> > ... which returns a string of commands to pass into target_cmd_root.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> Although I'm starting to wonder about the names here:
> 
> >                        create_iso_xorriso
> >                        create_empty_iso
> >                        iso_gen_flags_basic
> > +                      copy_iso_content_to_dir
> >                        rewrite_config_nocd
> 
> Maybe some of these should be called   iso_create_xorriso
> iso_create_empty  etc.
> 
> And maybe this one
> 
> > +sub copy_iso_content_to_dir($$) {
> > +    my ($gho,$newiso) = @_;
> > +    return <<"END";
> > +            set -ex
> > +            umount /mnt ||:
> > +            rm -rf $newiso
> > +            mount -o loop -r $gho->{Rimage} /mnt
> 
> should mention the word "image" in its name.  Eg
> "iso_copy_content_from_image" or something.
> 
> Let me know what you think.
> 

I'm fine with those renames. Will update in my next series.

Wei.

> Thanks,
> Ian.

[PATCH V4 09/12] Debian.pm: factor out preseed_base

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/Debian.pm |  143 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 80 insertions(+), 63 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 6759263..485e165 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -33,6 +33,7 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debian_boot_setup
                       %preseed_cmds
+                      preseed_base
                       preseed_create
                       preseed_hook_command preseed_hook_installscript
                       di_installcmdline_core
@@ -423,7 +424,83 @@ sub di_installcmdline_core ($$;@) {
         if defined $debconf_priority;
 
     return @cl;
-}             
+}
+
+sub preseed_base ($$;@) {
+    my ($suite,$extra_packages,%xopts) = @_;
+
+    return (<<END);
+d-i mirror/suite string $suite
+
+d-i debian-installer/locale string en_GB
+d-i console-keymaps-at/keymap select gb
+d-i keyboard-configuration/xkb-keymap string en_GB
+
+#d-i debconf/frontend string readline
+
+d-i mirror/country string manual
+d-i mirror/http/proxy string
+
+d-i clock-setup/utc boolean true
+d-i time/zone string Europe/London
+d-i clock-setup/ntp boolean true
+
+d-i partman-md/device_remove_md boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman-lvm/confirm boolean true
+
+d-i partman/confirm_nooverwrite true
+d-i partman-lvm/confirm_nooverwrite true
+d-i partman-md/confirm_nooverwrite true
+d-i partman-crypto/confirm_nooverwrite true
+
+#d-i netcfg/disable_dhcp boolean true
+d-i netcfg/get_nameservers string $c{NetNameservers}
+#d-i netcfg/get_netmask string \$c{NetNetmask}
+#d-i netcfg/get_gateway string \$c{NetGateway}
+d-i netcfg/confirm_static boolean true
+d-i netcfg/get_domain string $c{TestHostDomain}
+d-i netcfg/wireless_wep string
+
+d-i passwd/root-password password xenroot
+d-i passwd/root-password-again password xenroot
+d-i passwd/user-fullname string FLOSS Xen Test
+d-i passwd/username string osstest
+d-i passwd/user-password password osstest
+d-i passwd/user-password-again password osstest
+
+console-common  console-data/keymap/policy      select  Don't touch keymap
+console-data    console-data/keymap/policy      select  Don't touch keymap
+console-data    console-data/keymap/family      select  qwerty
+console-data console-data/keymap/template/layout select British
+
+popularity-contest popularity-contest/participate boolean false
+tasksel tasksel/first multiselect standard, web-server
+
+d-i grub-installer/only_debian boolean true
+
+d-i finish-install/keep-consoles boolean true
+d-i finish-install/reboot_in_progress note
+d-i cdrom-detect/eject boolean false
+
+d-i mirror/http/hostname string $c{DebianMirrorHost}
+d-i mirror/http/directory string /$c{DebianMirrorSubpath}
+d-i apt-setup/use_mirror boolean yes
+d-i apt-setup/another boolean false
+d-i apt-setup/non-free boolean false
+d-i apt-setup/contrib boolean false
+
+d-i pkgsel/include string openssh-server, ntp, ntpdate, $extra_packages
+
+$xopts{ExtraPreseed}
+
+### END OF DEBIAN PRESEED BASE
+
+END
+}          
 
 sub preseed_create ($$;@) {
     my ($ho, $sfx, %xopts) = @_;
@@ -610,45 +687,12 @@ END
 
     my $extra_packages = join(",",@extra_packages);
 
-    my $preseed_file= (<<END);
-d-i mirror/suite string $suite
-
-d-i debian-installer/locale string en_GB
-d-i console-keymaps-at/keymap select gb
-d-i keyboard-configuration/xkb-keymap string en_GB
-
-#d-i debconf/frontend string readline
-
-d-i mirror/country string manual
-d-i mirror/http/proxy string
-
-d-i clock-setup/utc boolean true
-d-i time/zone string Europe/London
-d-i clock-setup/ntp boolean true
+    my $preseed_file= preseed_base($suite,$extra_packages,%xopts);
 
+    $preseed_file .= (<<END);
 d-i partman-auto/method string lvm
 #d-i partman-auto/method string regular
 
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman-lvm/confirm boolean true
-
-d-i partman/confirm_nooverwrite true
-d-i partman-lvm/confirm_nooverwrite true
-d-i partman-md/confirm_nooverwrite true
-d-i partman-crypto/confirm_nooverwrite true
-
-#d-i netcfg/disable_dhcp boolean true
-d-i netcfg/get_nameservers string $c{NetNameservers}
-#d-i netcfg/get_netmask string \$c{NetNetmask}
-#d-i netcfg/get_gateway string \$c{NetGateway}
-d-i netcfg/confirm_static boolean true
-d-i netcfg/get_domain string $c{TestHostDomain}
-d-i netcfg/wireless_wep string
-
 #d-i partman-auto/init_automatically_partition select regular
 d-i partman-auto/disk string $disk
 
@@ -676,33 +720,6 @@ d-i partman-auto/expert_recipe string					\\
 			lv_name{ dummy }				\\
 		.
 
-d-i passwd/root-password password xenroot
-d-i passwd/root-password-again password xenroot
-d-i passwd/user-fullname string FLOSS Xen Test
-d-i passwd/username string osstest
-d-i passwd/user-password password osstest
-d-i passwd/user-password-again password osstest
-
-console-common  console-data/keymap/policy      select  Don't touch keymap
-console-data    console-data/keymap/policy      select  Don't touch keymap
-console-data    console-data/keymap/family      select  qwerty
-console-data console-data/keymap/template/layout select British
-
-popularity-contest popularity-contest/participate boolean false
-tasksel tasksel/first multiselect standard, web-server
-
-d-i pkgsel/include string openssh-server, ntp, ntpdate, $extra_packages
-
-d-i grub-installer/only_debian boolean true
-
-d-i finish-install/keep-consoles boolean true
-d-i finish-install/reboot_in_progress note
-d-i cdrom-detect/eject boolean false
-
-d-i mirror/http/hostname string $c{DebianMirrorHost}
-d-i mirror/http/directory string /$c{DebianMirrorSubpath}
-
-$xopts{ExtraPreseed}
 END
 
     foreach my $di_key (keys %preseed_cmds) {
-- 
1.7.10.4

[PATCH V4 10/12] Introduce ts-debian-hvm-install

[Wei Liu]

This is debian hvm guest test case. It resembles ts-redhat-install:
1. prepare a auto install CD
2. install debian hvm guest, currently using OVMF
3. test if the guest is up

The installtion CD is also bootable with seabios.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 ts-debian-hvm-install |  183 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100755 ts-debian-hvm-install

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
new file mode 100755
index 0000000..74acc66
--- /dev/null
+++ b/ts-debian-hvm-install
@@ -0,0 +1,183 @@
+#!/usr/bin/perl -w
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2009-2013 Citrix Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use strict qw(vars);
+use DBI;
+use Osstest;
+use Osstest::Debian;
+use Osstest::TestSupport;
+
+tsreadconfig();
+
+our $stage=0;
+if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
+
+our ($whhost,$gn) = @ARGV;
+$whhost ||= 'host';
+$gn ||= 'ovmf';
+
+our $ho= selecthost($whhost);
+
+our $ram_mb=    768;
+our $disk_mb= 10000;
+
+our $guesthost= "$gn.guest.osstest";
+our $gho;
+
+our $toolstack= toolstack()->{Command};
+
+
+sub preseed () {
+
+    my $preseed_file = preseed_base('wheezy','',());
+    my $authkeys = join('\\n', split(/\n/, authorized_keys()));
+
+    $preseed_file .= (<<END);
+d-i netcfg/get_hostname string $gn
+
+d-i partman-auto/disk string /dev/xvda
+d-i partman-auto/method string  regular
+
+d-i partman-auto/expert_recipe string \\
+        boot-root :: \\
+                512 50 512 vfat \\
+                        \$primary{ } \$bootable{ } \\
+                        method{ efi } format{ } \\
+                        use_filesystem{ } filesystem{ vfat } \\
+                        mountpoint{ /boot/efi } \\
+                . \\
+                5000 50 5000 ext4 \\
+                        method{ format } format{ } \\
+                        use_filesystem{ } filesystem{ ext4 } \\
+                        mountpoint{ / } \\
+                . \\
+                512 30 100% linux-swap \\
+                        method{ swap } format{ } \\
+                .
+
+d-i apt-setup/cdrom/set-first boolean false
+
+d-i preseed/late_command string \\
+        in-target mkdir -p /boot/efi/EFI/boot; \\
+        in-target cp /boot/efi/EFI/debian/grubx64.efi /boot/efi/EFI/boot/bootx64.efi ;\\
+        in-target mkdir -p /root/.ssh; \\
+        in-target sh -c "echo -e '$authkeys'> /root/.ssh/authorized_keys";
+END
+    return $preseed_file;
+}
+
+sub grub_cfg () {
+
+    return <<"END";
+set default="0"
+set timeout=5
+
+menuentry 'debian guest auto Install' {
+    linux /install.amd/vmlinuz console=vga console=ttyS0,115200n8 preseed/file=/preseed.cfg
+    initrd /install.amd/initrd.gz
+}
+END
+}
+
+sub isolinux_cfg () {
+    return <<"END";
+    default autoinstall
+    prompt 0
+    timeout 0
+
+    label autoinstall
+        kernel /install.amd/vmlinuz
+        append video=vesa:ywrap,mtrr vga=788 console=ttyS0,115200n8 preseed/file=/preseed.cfg initrd=/install.amd/initrd.gz
+END
+}
+
+sub prepare_initrd ($$$) {
+    my ($initrddir,$newiso,$preseed_file_path) = @_;
+    return <<"END";
+      rm -rf $initrddir
+      mkdir $initrddir
+      cd $initrddir
+      gzip -d \< $newiso/install.amd/initrd.gz | cpio --extract --make-directories --no-absolute-filename
+      cp $preseed_file_path preseed.cfg
+      find . | cpio -H newc --create | gzip -9 \> $newiso/install.amd/initrd.gz
+      cd -
+      rm -rf $initrddir
+      cd $newiso
+      md5sum `find -L -type f -print0 | xargs -0` \> md5sum.txt
+      cd -
+END
+}
+
+our $emptyiso= "/root/$flight.$job.$gn-empty.iso";
+
+sub prep () {
+    target_install_packages_norec($ho, qw(lvm2 rsync));
+
+    my $isotimeout= 600;
+
+    $gho= prepareguest($ho, $gn, $guesthost, 22,
+                       $disk_mb + 1,
+                       100);
+
+    my $newiso= "/root/$flight.$job.$gn-newiso";
+    my $emptydir= "/root/$flight.$job.$gn-empty-dir";
+    my $initrddir= "/root/$flight.$job.$gn-initrd-dir";
+    my $preseed_file_path = "/root/$flight.$job.$gn-preseed";
+
+    my @xorriso_extra = qw(-eltorito-alt-boot
+                           -e boot/grub/efi.img
+                           -no-emul-boot
+                           -r);
+    my @xorriso_opts = (iso_gen_flags_basic(), @xorriso_extra);
+
+    create_empty_iso($ho, $emptyiso, $emptydir);
+
+    target_putfilecontents_root_stash($ho, 10, preseed(),
+                                      $preseed_file_path);
+
+    more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
+                          OnReboot => 'preserve',
+                          Bios => 'ovmf',
+                          PostImageHook => sub {
+        my $cmds = copy_iso_content_to_dir($gho, $newiso);
+        $cmds .= prepare_initrd($initrddir,$newiso,$preseed_file_path);
+        target_cmd_root($ho, $cmds, $isotimeout);
+        target_putfilecontents_root_stash($ho, 10, grub_cfg(),
+                                          "$newiso/debian/boot/grub/grub.cfg");
+
+        target_putfilecontents_root_stash($ho, 10, isolinux_cfg(),
+                                          "$newiso/isolinux/isolinux.cfg");
+
+        create_iso_xorriso($ho, $gho->{Rimage}, $newiso, $isotimeout, @xorriso_opts);
+    });
+}
+
+if (!$stage) {
+    prep();
+    guest_create($ho,$gho,$toolstack);
+} else {
+    $gho= selectguest($gn,$gho);
+}
+if ($stage<2) {
+    guest_await_reboot($ho,$gho,2000);
+    guest_destroy($ho,$gho);
+}
+
+rewrite_config_nocd($ho,$gho,$emptyiso);
+guest_create($ho,$gho,$toolstack);
+guest_await_dhcp_tcp($gho,300);
+guest_check_up($gho);
-- 
1.7.10.4

Re: [PATCH V4 10/12] Introduce ts-debian-hvm-install

[Ian Jackson]

Wei Liu writes ("[PATCH V4 10/12] Introduce ts-debian-hvm-install"):
> This is debian hvm guest test case. It resembles ts-redhat-install:
> 1. prepare a auto install CD
> 2. install debian hvm guest, currently using OVMF
> 3. test if the guest is up

Thanks.  On this patch I have only trivial comments:

> +our $stage=0;
> +if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }

What's this business for ?  Is it just for debugging ?  In which case
fine.

> +sub prepare_initrd ($$$) {
> +    my ($initrddir,$newiso,$preseed_file_path) = @_;
> +    return <<"END";
> +      rm -rf $initrddir
> +      mkdir $initrddir
> +      cd $initrddir
> +      gzip -d \< $newiso/install.amd/initrd.gz | cpio --extract --make-directories --no-absolute-filename

I'm not sure why you have the \ in front of < and > here.

> +    my $newiso= "/root/$flight.$job.$gn-newiso";
> +    my $emptydir= "/root/$flight.$job.$gn-empty-dir";
> +    my $initrddir= "/root/$flight.$job.$gn-initrd-dir";
> +    my $preseed_file_path = "/root/$flight.$job.$gn-preseed";

This would be less messy and repetitive with an extra variable (to
encapsulate the prefix "/root/$flight.$job.$gn"), and/or perhaps a
mkdir.

Thanks,
Ian.

Re: [PATCH V4 10/12] Introduce ts-debian-hvm-install

[Wei Liu]

On Wed, Apr 02, 2014 at 05:15:49PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH V4 10/12] Introduce ts-debian-hvm-install"):
> > This is debian hvm guest test case. It resembles ts-redhat-install:
> > 1. prepare a auto install CD
> > 2. install debian hvm guest, currently using OVMF
> > 3. test if the guest is up
> 
> Thanks.  On this patch I have only trivial comments:
> 
> > +our $stage=0;
> > +if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
> 

This comes from ts-redhat-install. My understanding is that it's used
for debugging. By specifying --stage the test can bypass certain step
such as guest installation.

> What's this business for ?  Is it just for debugging ?  In which case
> fine.
> 
> > +sub prepare_initrd ($$$) {
> > +    my ($initrddir,$newiso,$preseed_file_path) = @_;
> > +    return <<"END";
> > +      rm -rf $initrddir
> > +      mkdir $initrddir
> > +      cd $initrddir
> > +      gzip -d \< $newiso/install.amd/initrd.gz | cpio --extract --make-directories --no-absolute-filename
> 
> I'm not sure why you have the \ in front of < and > here.
> 

That's me being not familiar with perl string and too careful. Fixed.

> > +    my $newiso= "/root/$flight.$job.$gn-newiso";
> > +    my $emptydir= "/root/$flight.$job.$gn-empty-dir";
> > +    my $initrddir= "/root/$flight.$job.$gn-initrd-dir";
> > +    my $preseed_file_path = "/root/$flight.$job.$gn-preseed";
> 
> This would be less messy and repetitive with an extra variable (to
> encapsulate the prefix "/root/$flight.$job.$gn"), and/or perhaps a
> mkdir.
> 

Done.

Wei.

> Thanks,
> Ian.

Re: [PATCH V4 10/12] Introduce ts-debian-hvm-install

[Ian Jackson]

Wei Liu writes ("Re: [PATCH V4 10/12] Introduce ts-debian-hvm-install"):
> On Wed, Apr 02, 2014 at 05:15:49PM +0100, Ian Jackson wrote:
> > > +our $stage=0;
> > > +if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
> 
> This comes from ts-redhat-install. My understanding is that it's used
> for debugging. By specifying --stage the test can bypass certain step
> such as guest installation.

That shows how much memory I have of things I wrote :-).  Thanks.

Thanks,
Ian.

[PATCH V4 11/12] sg-run-job: OVMF job

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Ack-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 sg-run-job |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sg-run-job b/sg-run-job
index db62365..daa018d 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -265,6 +265,12 @@ proc run-job/test-rhelhvm {} {
     test-guest-nomigr redhat
 }
 
+proc need-hosts/test-debianhvm {} { return host }
+proc run-job/test-debianhvm {} {
+    run-ts . = ts-debian-hvm-install
+    test-guest ovmf
+}
+
 proc need-hosts/test-pair {} { return {src_host dst_host} }
 proc run-job/test-pair {} {
     run-ts . =              ts-debian-install      dst_host
-- 
1.7.10.4

Re: [PATCH V4 11/12] sg-run-job: OVMF job

[Ian Jackson]

Wei Liu writes ("[PATCH V4 11/12] sg-run-job: OVMF job"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Ack-by: Ian Jackson <ian.jackson@eu.citrix.com>

YM

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Thanks,
Ian.

[PATCH V4 12/12] make-flight: OVMF test flight

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 make-flight |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/make-flight b/make-flight
index 092a0cf..f7a31a0 100755
--- a/make-flight
+++ b/make-flight
@@ -152,6 +152,17 @@ do_hvm_win7_x64_tests () {
             all_hostflags=$most_hostflags,hvm
 }
 
+do_hvm_debian_ovmf_tests() {
+  if [ $xenarch != amd64 -o "x$qemuu_suffix" != "x-qemuu" ]; then
+    return
+  fi
+
+  job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-ovmf-amd64 \
+    test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+    ovmf_image=debian-7.2.0-amd64-CD-1.iso \
+    all_hostflags=$most_hostflags,hvm
+}
+
 do_hvm_rhel6_tests () {
   if [ $xenarch != amd64 -o $dom0arch != i386 -o "$kern" != "" ]; then
     return
@@ -253,6 +264,8 @@ test_matrix_do_one () {
     do_hvm_win7_x64_tests
     do_hvm_rhel6_tests
 
+    do_hvm_debian_ovmf_tests
+
   done # qemuu_suffix
 
   # Test live migration
-- 
1.7.10.4

Re: [PATCH V4 12/12] make-flight: OVMF test flight

[Ian Jackson]

Wei Liu writes ("[PATCH V4 12/12] make-flight: OVMF test flight"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Can you put into the commit message for this a diff showing the
results in terms of the runvars of the new flight ?

Thanks,
Ian.

Re: [PATCH V4 12/12] make-flight: OVMF test flight

[Ian Campbell]

On Wed, 2014-04-02 at 17:27 +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH V4 12/12] make-flight: OVMF test flight"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> 
> Can you put into the commit message for this a diff showing the
> results in terms of the runvars of the new flight ?

Wei, in case you didn't know "./mg-show-flight-runvars $flight" is what
you need here.

Ian.

Re: [PATCH V4 00/12] OSSTest: OVMF test job

[Wei Liu]

Ping?

On Fri, Mar 21, 2014 at 04:14:14PM +0000, Wei Liu wrote:
> This series implements a basic test job for OVMF guest. The test case will
> install an OVMF guest and try to boot it.
>