[PATCH RFC 0/5] OSSTest: OVMF guest test case

[PATCH RFC 0/5] OSSTest: OVMF guest test case

[Wei Liu]

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

OVMF will need to build for amd64 target and used with QEMU upstream.
Not very sure whether I did the right thing to make-flight and sg-run-job
though.

Wei.

Wei Liu (5):
  TestSupport.pm: add bios option to guest config file
  Build OVMF for Xen-unstable
  Introduce ts-ovmf-debian-install
  make-flight: OVMF test filght
  sg-run-job: OVMF job

 Osstest/TestSupport.pm |    5 +
 make-flight            |   16 ++-
 sg-run-job             |    6 ++
 ts-ovmf-debian-install |  251 ++++++++++++++++++++++++++++++++++++++++++++++++
 ts-xen-build           |    6 +-
 5 files changed, 282 insertions(+), 2 deletions(-)
 create mode 100755 ts-ovmf-debian-install

-- 
1.7.10.4

[PATCH RFC 1/5] TestSupport.pm: add bios option to guest config file

[Wei Liu]

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

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 233d453..dbf9061 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1424,6 +1424,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

Re: [PATCH RFC 1/5] TestSupport.pm: add bios option to guest config file

[Ian Jackson]

Wei Liu writes ("[PATCH RFC 1/5] TestSupport.pm: add bios option to guest config file"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

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

As far as it goes...

Ian.

[PATCH RFC 2/5] Build OVMF for Xen-unstable

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 make-flight  |   10 +++++++++-
 ts-xen-build |    6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/make-flight b/make-flight
index 65e3abc..8d900e2 100755
--- a/make-flight
+++ b/make-flight
@@ -88,6 +88,14 @@ if [ x$buildflight = x ]; then
     *) enable_xend=false;;
     esac
 
+    case "$xenbranch" in
+    xen-3.*-testing) enable_ovmf=false;;
+    xen-4.0-testing) enable_ovmf=false;;
+    xen-4.1-testing) enable_ovmf=false;;
+    xen-4.2-testing) enable_ovmf=false;;
+    *) enable_ovmf=true;
+    esac
+
     eval "
 	arch_runvars=\"\$ARCH_RUNVARS_$arch\"
     "
@@ -95,7 +103,7 @@ if [ x$buildflight = x ]; then
     build_hostflags=share-build-$suite-$arch,arch-$arch,suite-$suite,purpose-build
 
     ./cs-job-create $flight build-$arch build				     \
-		arch=$arch enable_xend=$enable_xend						     \
+		arch=$arch enable_xend=$enable_xend enable_ovmf=$enable_ovmf	     \
 	tree_qemu=$TREE_QEMU	     \
 	tree_qemuu=$TREE_QEMU_UPSTREAM	     \
 	tree_xen=$TREE_XEN		     \
diff --git a/ts-xen-build b/ts-xen-build
index ebb7d6f..74d17f0 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -125,14 +125,18 @@ sub build () {
         ' buildconfigs/enable-xen-config
 END
     my $xend_opt= $r{enable_xend} =~ m/true/ ? "--enable-xend" : "--disable-xend";
+    my $ovmf_opt= $r{enable_ovmf} =~ m/true/ ? "--enable-ovmf" : "--disable-ovmf";
 
     buildcmd_stamped_logged(300, 'configure', <<END,<<END,<<END);
             if test -f configure; then
                 if grep -q -- $xend_opt tools/configure ; then
 		    xend=$xend_opt
                 fi
+                if grep -q -- $ovmf_opt tools/configure ; then
+                    ovmf=$ovmf_opt
+                fi
 END
-                ./configure --sysconfdir=/etc \$xend
+                ./configure --sysconfdir=/etc \$xend \$ovmf
 END
             fi
 END
-- 
1.7.10.4

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Ian Jackson]

Wei Liu writes ("[PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

This looks plausible, but I would like to see a diff of the output of
mg-show-flight-runvars to see what the new job(s) look like.  Can you
produce one easily ?

Ian.

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Ian Jackson]

Ian Jackson writes ("Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> Wei Liu writes ("[PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> 
> This looks plausible, but I would like to see a diff of the output of
> mg-show-flight-runvars to see what the new job(s) look like.  Can you
> produce one easily ?

Sorry, this comment is misplaced.  I intended it to be a reply to
    Subject: [PATCH RFC 4/5] make-flight: OVMF test filght

Thanks,
Ian.

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Ian Jackson]

Wei Liu writes ("[PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

This looks plausible.  Is there some reason it shouldn't go in right
away, to arrange that ovmf is build-tested ?

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

Thanks,
Ian.

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Wei Liu]

On Tue, Dec 10, 2013 at 05:26:06PM +0000, Ian Jackson wrote:
> Wei Liu writes ("[PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> 
> This looks plausible.  Is there some reason it shouldn't go in right
> away, to arrange that ovmf is build-tested ?
> 

I think it is OK to arrange this to go in right away.

Wei.

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

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Ian Campbell]

On Tue, 2013-12-10 at 17:38 +0000, Wei Liu wrote:
> On Tue, Dec 10, 2013 at 05:26:06PM +0000, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > 
> > This looks plausible.  Is there some reason it shouldn't go in right
> > away, to arrange that ovmf is build-tested ?
> > 
> 
> I think it is OK to arrange this to go in right away.

This has some subset of the same risks as the patch to enable it by
default (i.e. it causes grief in the push gate) -- it might be wise at
this stage of the release to involve George in these sorts of decisions
for osstest?

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

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> On Tue, 2013-12-10 at 17:38 +0000, Wei Liu wrote:
> > I think it is OK to arrange this to go in right away.
> 
> This has some subset of the same risks as the patch to enable it by
> default (i.e. it causes grief in the push gate) -- it might be wise at
> this stage of the release to involve George in these sorts of decisions
> for osstest?

If it causes grief in the push gate, it will only be a problem for the
release process if that grief is nondeterministic - since osstest has
its own push gate for its own code.

If it causes grief in the osstest self-push-gate, I can revert it.

Ian.

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Ian Campbell]

On Tue, 2013-12-10 at 19:31 +0000, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> > On Tue, 2013-12-10 at 17:38 +0000, Wei Liu wrote:
> > > I think it is OK to arrange this to go in right away.
> > 
> > This has some subset of the same risks as the patch to enable it by
> > default (i.e. it causes grief in the push gate) -- it might be wise at
> > this stage of the release to involve George in these sorts of decisions
> > for osstest?
> 
> If it causes grief in the push gate, it will only be a problem for the
> release process if that grief is nondeterministic - since osstest has
> its own push gate for its own code.

Yes, my concern was that it would make it into the main osstest system
and then cause spurious failures and get in the way etc. That's as much
a risk to the release process as any other code change I think.

> If it causes grief in the osstest self-push-gate, I can revert it.

Or indeed if it turns out to cause grief in the system once pushed.

Ian.

Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable

[Ian Jackson]

Wei Liu writes ("Re: [PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> On Tue, Dec 10, 2013 at 05:26:06PM +0000, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH RFC 2/5] Build OVMF for Xen-unstable"):
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > 
> > This looks plausible.  Is there some reason it shouldn't go in right
> > away, to arrange that ovmf is build-tested ?
> > 
> 
> I think it is OK to arrange this to go in right away.

OK, pushed.

Thanks,
Ian.

[PATCH RFC 3/5] Introduce ts-ovmf-debian-install

[Wei Liu]

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

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

diff --git a/ts-ovmf-debian-install b/ts-ovmf-debian-install
new file mode 100755
index 0000000..723bf4f
--- /dev/null
+++ b/ts-ovmf-debian-install
@@ -0,0 +1,251 @@
+#!/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::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 $xl= toolstack()->{Command};
+
+
+sub preseed () {
+
+    return <<"END";
+#### Contents of the preconfiguration file (for wheezy)
+#### Prepared for OVMF guest -- liuw
+
+d-i mirror/suite string wheezy
+
+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 netcfg/get_hostname string ovmf-test
+d-i netcfg/get_domain string
+d-i netcfg/wireless_wep string
+
+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-auto/disk string /dev/xvda
+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 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 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
+
+d-i apt-setup/use_mirror boolean false
+d-i apt-setup/another boolean false
+d-i apt-setup/non-free boolean false
+d-i apt-setup/contrib boolean false
+d-i apt-setup/cdrom/set-first boolean false
+
+popularity-contest popularity-contest/participate boolean false
+tasksel tasksel/first multiselect standard
+
+d-i pkgsel/include string openssh-server, ntp, ntpdate, 
+
+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 preseed/early_command string
+
+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; \\
+        cp /authorized_keys /target/root/.ssh
+
+d-i clock-setup/ntp-server string ntp.uk.xensource.com
+
+END
+
+}
+
+sub grub_cfg () {
+
+    return <<"END";
+set default="0"
+set timeout=5
+
+menuentry 'OVMF guest auto Install' {
+    linux /install.amd/vmlinuz console=vga console=ttyS0,115200n8 preseed/file=/preseed.cfg
+    initrd /install.amd/initrd.gz
+}
+END
+}
+
+our $emptyiso= '/root/empty.iso';
+
+sub prep () {
+    target_install_packages_norec($ho, qw(lvm2 rsync xorriso genisoimage));
+
+    my $isotimeout= 600;
+
+    $gho= prepareguest($ho, $gn, $guesthost, 22,
+                       $disk_mb + 1,
+                       100);
+
+    my $newiso= '/root/newiso';
+    my $emptydir= '/root/empty-dir';
+    my $initrddir= '/root/initrd-dir';
+
+    my @isogen_base= qw(-R -J -T);
+    my @xorriso_opts= qw(-as mkisofs
+                         -r
+                         -b isolinux/isolinux.bin
+                         -c isolinux/boot.cat
+                         -no-emul-boot
+                         -boot-load-size 4
+                         -boot-info-table
+                         -eltorito-alt-boot
+                         -e boot/grub/efi.img
+                         -no-emul-boot);
+
+    target_putfilecontents_root_stash($ho, 10, preseed(),
+                                      "/root/ovmf-guest-preseed");
+    target_putfilecontents_root_stash($ho, 10, authorized_keys(),
+                                      "/root/ovmf-guest-authkeys");
+    target_cmd_root($ho, <<END, 60);
+            mkdir -p $emptydir
+            genisoimage -o $emptyiso @isogen_base $emptydir/.
+END
+
+    more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb,
+                          OnReboot => 'preserve',
+                          Bios => 'ovmf',
+                          PostImageHook => sub {
+        target_cmd_root($ho, <<END, $isotimeout);
+            set -x
+            umount /mnt ||:
+            rm -rf $newiso
+            mount -o loop -r $gho->{Rimage} /mnt
+            mkdir $newiso
+            cp -a /mnt/. $newiso/.
+            umount /mnt
+            rm -rf $initrddir
+            mkdir $initrddir
+            cd $initrddir
+            gzip -d \< $newiso/install.amd/initrd.gz | cpio --extract --make-directories --no-absolute-filename
+            cp /root/ovmf-guest-preseed preseed.cfg
+            cp /root/ovmf-guest-authkeys authorized_keys
+            find . | cpio -H newc --create | gzip -9 \> $newiso/install.amd/initrd.gz
+            cd -
+            rm -rf $initrddir
+            cd $newiso
+            md5sum `find -follow -type f` \> md5sum.txt
+            cd -
+END
+        target_putfilecontents_root_stash($ho, 10, grub_cfg(),
+					  "$newiso/debian/boot/grub/grub.cfg");
+
+	target_cmd_root($ho, <<END, $isotimeout);
+	    xorriso  @xorriso_opts -o $gho->{Rimage} $newiso/.
+END
+    });
+}
+
+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();
+} else {
+    $gho= selectguest($gn,$gho);
+}
+if ($stage<2) {
+    guest_await_reboot($ho,$gho,2000);
+    guest_destroy($ho,$gho);
+}
+
+rewrite_config_nocd();
+start();
+guest_await_dhcp_tcp($gho,300);
+guest_check_up($gho);
-- 
1.7.10.4

Re: [PATCH RFC 3/5] Introduce ts-ovmf-debian-install

[Ian Jackson]

Wei Liu writes ("[PATCH RFC 3/5] Introduce ts-ovmf-debian-install"):
> This is OVMF guest test case. It resembles ts-redhat-install:
> 1. prepare a auto install CD
> 2. install OVMF guest
> 3. test if the guets is up

This seems to duplicate an awful lot of the preseed generation from
Osstest::Debian::preseed_create.

I'm afraid you'll need to refactor this to remove the duplication.
This might well involve a code-motion-only pre-patch.

Thanks,
Ian.

Re: [PATCH RFC 3/5] Introduce ts-ovmf-debian-install

[Ian Jackson]

Ian Jackson writes ("Re: [PATCH RFC 3/5] Introduce ts-ovmf-debian-install"):
> Wei Liu writes ("[PATCH RFC 3/5] Introduce ts-ovmf-debian-install"):
> > This is OVMF guest test case. It resembles ts-redhat-install:
> > 1. prepare a auto install CD
> > 2. install OVMF guest
> > 3. test if the guets is up
> 
> This seems to duplicate an awful lot of the preseed generation from
> Osstest::Debian::preseed_create.
> 
> I'm afraid you'll need to refactor this to remove the duplication.
> This might well involve a code-motion-only pre-patch.

Also, how much does this differ from a hypothetical
ts-debian-hvm-install ?

Perhaps the answer is to have a ts-debian-hvm-install and control the
use of ovmf with a runvar.

Ian.

Re: [PATCH RFC 3/5] Introduce ts-ovmf-debian-install

[Wei Liu]

On Tue, Dec 10, 2013 at 05:31:12PM +0000, Ian Jackson wrote:
> Ian Jackson writes ("Re: [PATCH RFC 3/5] Introduce ts-ovmf-debian-install"):
> > Wei Liu writes ("[PATCH RFC 3/5] Introduce ts-ovmf-debian-install"):
> > > This is OVMF guest test case. It resembles ts-redhat-install:
> > > 1. prepare a auto install CD
> > > 2. install OVMF guest
> > > 3. test if the guets is up
> > 
> > This seems to duplicate an awful lot of the preseed generation from
> > Osstest::Debian::preseed_create.
> > 
> > I'm afraid you'll need to refactor this to remove the duplication.
> > This might well involve a code-motion-only pre-patch.
> 
> Also, how much does this differ from a hypothetical
> ts-debian-hvm-install ?
> 

1. preseed files are different
2. vanilla debian hvm installation won't need to manipulate ISO

> Perhaps the answer is to have a ts-debian-hvm-install and control the
> use of ovmf with a runvar.
> 

Are those two easy to implement with runvars?

Wei.

> Ian.

Re: [PATCH RFC 3/5] Introduce ts-ovmf-debian-install

[Wei Liu]

On Tue, Dec 10, 2013 at 05:36:25PM +0000, Wei Liu wrote:
> On Tue, Dec 10, 2013 at 05:31:12PM +0000, Ian Jackson wrote:
> > Ian Jackson writes ("Re: [PATCH RFC 3/5] Introduce ts-ovmf-debian-install"):
> > > Wei Liu writes ("[PATCH RFC 3/5] Introduce ts-ovmf-debian-install"):
> > > > This is OVMF guest test case. It resembles ts-redhat-install:
> > > > 1. prepare a auto install CD
> > > > 2. install OVMF guest
> > > > 3. test if the guets is up
> > > 
> > > This seems to duplicate an awful lot of the preseed generation from
> > > Osstest::Debian::preseed_create.
> > > 
> > > I'm afraid you'll need to refactor this to remove the duplication.
> > > This might well involve a code-motion-only pre-patch.
> > 
> > Also, how much does this differ from a hypothetical
> > ts-debian-hvm-install ?
> > 
> 
> 1. preseed files are different
> 2. vanilla debian hvm installation won't need to manipulate ISO
> 

Was wrong on the second one. I actually meant vanilla debian manipulates
ISO in slightly different way.

Wei.

> > Perhaps the answer is to have a ts-debian-hvm-install and control the
> > use of ovmf with a runvar.
> > 
> 
> Are those two easy to implement with runvars?
> 
> Wei.
> 
> > Ian.

[PATCH RFC 4/5] make-flight: OVMF test filght

[Wei Liu]

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

diff --git a/make-flight b/make-flight
index 8d900e2..51aebe2 100755
--- a/make-flight
+++ b/make-flight
@@ -418,7 +418,13 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
                 test-win xl $qemuu_runvar \
 		win_image=win7-x64.iso \
 		all_hostflags=$most_hostflags,hvm
+      fi
 
+      if [ $xenarch = amd64 -a "x$qemuu_suffix" = "x-qemuu" ]; then
+      job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-ovmf-amd64 \
+                test-debianhvm xl $qemuu_runvar \
+		ovmf_image=debian-7.2.0-amd64-CD-1.iso \
+		all_hostflags=$most_hostflags,hvm
       fi
 
       if [ $xenarch = amd64 -a $dom0arch = i386 -a "$kern" = "" ]; then
-- 
1.7.10.4

Re: [PATCH RFC 4/5] make-flight: OVMF test filght

[Wei Liu]

IanJ

This is the output of 
./mg-show-flight-runvars standalone | grep ovmf

test-amd64-amd64-xl-qemuu-ovmf-amd64     all_hostflags             arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test,hvm                         
test-amd64-i386-xl-qemuu-ovmf-amd64      all_hostflags             arch-i386,arch-xen-amd64,suite-wheezy,purpose-test,hvm                          
test-amd64-amd64-xl-qemuu-ovmf-amd64     arch                      amd64                                                                           
test-amd64-i386-xl-qemuu-ovmf-amd64      arch                      i386                                                                            
test-amd64-amd64-xl-qemuu-ovmf-amd64     buildjob                  build-amd64                                                                     
test-amd64-i386-xl-qemuu-ovmf-amd64      buildjob                  build-i386                                                                      
test-amd64-amd64-xl-qemuu-ovmf-amd64     console                   hvc0                                                                            
test-amd64-amd64-xl-qemuu-ovmf-amd64     device_model_version      qemu-xen                                                                        
test-amd64-i386-xl-qemuu-ovmf-amd64      device_model_version      qemu-xen                                                                        
build-amd64                              enable_ovmf               true                                                                            
build-armhf                              enable_ovmf               true                                                                            
build-i386                               enable_ovmf               true                                                                            
test-amd64-amd64-xl-qemuu-ovmf-amd64     host                      cam-st12                                                                        
test-amd64-amd64-xl-qemuu-ovmf-amd64     kernbuildjob              build-amd64-pvops                                                               
test-amd64-i386-xl-qemuu-ovmf-amd64      kernbuildjob              build-i386-pvops                                                                
test-amd64-amd64-xl-qemuu-ovmf-amd64     kernkind                  pvops                                                                           
test-amd64-i386-xl-qemuu-ovmf-amd64      kernkind                  pvops                                                                           
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_boot_timeout         100                                                                             
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_cfgpath              /etc/xen/ovmf.guest.osstest.cfg                                                 
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_disk_lv              ovmf.guest.osstest-disk                                                         
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_domname              ovmf.guest.osstest                                                              
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_ether                5e:36:06:59:00:02                                                               
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_hostname             ovmf.guest.osstest                                                              
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_image                debian-7.2.0-amd64-CD-1.iso                                                     
test-amd64-i386-xl-qemuu-ovmf-amd64      ovmf_image                debian-7.2.0-amd64-CD-1.iso                                                     
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_tcpcheckport         22                                                                              
test-amd64-amd64-xl-qemuu-ovmf-amd64     ovmf_vg                   cam-st12                                                                        
test-amd64-amd64-xl-qemuu-ovmf-amd64     toolstack                 xl                                                                              
test-amd64-i386-xl-qemuu-ovmf-amd64      toolstack                 xl                                                                              
test-amd64-amd64-xl-qemuu-ovmf-amd64     xen_kernel_path           /boot/vmlinuz-3.4.73+                                                           
test-amd64-amd64-xl-qemuu-ovmf-amd64     xen_kernel_ver            3.4.73+                                                                         
test-amd64-amd64-xl-qemuu-ovmf-amd64     xenbuildjob               build-amd64                                                                     
test-amd64-i386-xl-qemuu-ovmf-amd64      xenbuildjob               build-amd64                                                                     

Wei.

[PATCH RFC 5/5] sg-run-job: OVMF job

[Wei Liu]

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

diff --git a/sg-run-job b/sg-run-job
index f91da85..29e4376 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -264,6 +264,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-ovmf-debian-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