* [PATCH v5 01/13] standalone-reset: fix typo
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-03 14:16 ` Ian Jackson
2014-04-02 19:29 ` [PATCH v5 02/13] TestSupport.pm: add bios option to guest config file Wei Liu
` (11 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
The script name is sa-init-db not sa-db-init.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
standalone-reset | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/standalone-reset b/standalone-reset
index 09c0269..8555039 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -133,7 +133,7 @@ esac
if test -f standalone.db; then
./sa-forget-flight standalone.db "$flight"
else
- ./sa-db-init standalone.db
+ ./sa-init-db standalone.db
fi
: ${BUILD_LVEXTEND_MAX:=50}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 02/13] TestSupport.pm: add bios option to guest config file
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
2014-04-02 19:29 ` [PATCH v5 01/13] standalone-reset: fix typo Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-02 19:29 ` [PATCH v5 03/13] TestSupport.pm: introduce iso_create_xorriso Wei Liu
` (10 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
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 a957a69..37e8b9e 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1471,6 +1471,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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 03/13] TestSupport.pm: introduce iso_create_xorriso
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
2014-04-02 19:29 ` [PATCH v5 01/13] standalone-reset: fix typo Wei Liu
2014-04-02 19:29 ` [PATCH v5 02/13] TestSupport.pm: add bios option to guest config file Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-03 14:17 ` Ian Jackson
2014-04-02 19:29 ` [PATCH v5 04/13] TestSupport.pm: move rewrite_config_nocd to support library Wei Liu
` (9 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
... and convert ts-redhat-install to make use of it.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Osstest/TestSupport.pm | 16 ++++++++++++++++
ts-redhat-install | 15 +++++----------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 37e8b9e..a7bb20f 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -100,6 +100,8 @@ BEGIN {
setup_pxeboot setup_pxeboot_local host_pxefile
ether_prefix
+
+ iso_create_xorriso
);
%EXPORT_TAGS = ( );
@@ -1888,4 +1890,18 @@ default local
END
}
+#---------- ISO images ----------
+sub iso_create_xorriso ($$$$;@) {
+ my ($ho,$iso,$dir,$isotimeout,@xopts) = @_;
+
+ # These options forces ISO creation even if input directory is
+ # empty. They have to go last.
+ my @force_iso_creation = qw(-- -changes_pending yes);
+
+ target_cmd_root($ho, <<END, 60);
+ mkdir -p $dir
+ xorriso @xopts -o $iso $dir/. @force_iso_creation
+END
+}
+
1;
diff --git a/ts-redhat-install b/ts-redhat-install
index a945033..c44b12a 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 xorriso));
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
+ iso_create_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
+ iso_create_xorriso($ho, $gho->{Rimage}, $newiso, $isotimeout, @isogen);
});
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 04/13] TestSupport.pm: move rewrite_config_nocd to support library
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (2 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 03/13] TestSupport.pm: introduce iso_create_xorriso Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-03 14:18 ` Ian Jackson
2014-04-02 19:29 ` [PATCH v5 05/13] TestSupport.pm: introduce guest_create Wei Liu
` (8 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
... and rename it to guest_editconfig_nocd.
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 a7bb20f..094508d 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -102,6 +102,7 @@ BEGIN {
ether_prefix
iso_create_xorriso
+ guest_editconfig_nocd
);
%EXPORT_TAGS = ( );
@@ -1904,4 +1905,14 @@ sub iso_create_xorriso ($$$$;@) {
END
}
+sub guest_editconfig_nocd ($$) {
+ my ($gho,$emptyiso) = @_;
+ guest_editconfig($gho->{Host}, $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 c44b12a..e1754f5 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();
+guest_editconfig_nocd($gho,$emptyiso);
start();
guest_await_dhcp_tcp($gho,300);
guest_check_up($gho);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 05/13] TestSupport.pm: introduce guest_create
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (3 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 04/13] TestSupport.pm: move rewrite_config_nocd to support library Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-02 19:29 ` [PATCH v5 06/13] ts-redhat-install: use $flight, $job and $gn when creating iso Wei Liu
` (7 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.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 094508d..23e7f7d 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -93,7 +93,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
@@ -1243,7 +1243,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 ($gho,$toolstack) = @_;
+ target_cmd_root($gho->{Host}, "$toolstack create $gho->{CfgPath}", 100);
+}
+
sub target_choose_vg ($$) {
my ($ho, $mbneeded) = @_;
diff --git a/ts-redhat-install b/ts-redhat-install
index e1754f5..b29d2d4 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($gho,$xl);
} else {
$gho= selectguest($gn,$gho);
}
@@ -180,6 +176,6 @@ if ($stage<2) {
}
guest_editconfig_nocd($gho,$emptyiso);
-start();
+guest_create($gho,$xl);
guest_await_dhcp_tcp($gho,300);
guest_check_up($gho);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 06/13] ts-redhat-install: use $flight, $job and $gn when creating iso
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (4 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 05/13] TestSupport.pm: introduce guest_create Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-02 19:29 ` [PATCH v5 07/13] TestSupport.pm: introduce iso_create_empty Wei Liu
` (6 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-redhat-install | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ts-redhat-install b/ts-redhat-install
index b29d2d4..e7e3d73 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 xorriso));
@@ -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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 07/13] TestSupport.pm: introduce iso_create_empty
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (5 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 06/13] ts-redhat-install: use $flight, $job and $gn when creating iso Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-03 14:18 ` Ian Jackson
2014-04-02 19:29 ` [PATCH v5 08/13] TestSupport.pm: introduce iso_gen_flags_basic Wei Liu
` (5 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Osstest/TestSupport.pm | 8 ++++++++
ts-redhat-install | 17 ++++++++---------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 23e7f7d..1b90d17 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -102,6 +102,7 @@ BEGIN {
ether_prefix
iso_create_xorriso
+ iso_create_empty
guest_editconfig_nocd
);
%EXPORT_TAGS = ( );
@@ -1911,6 +1912,13 @@ sub iso_create_xorriso ($$$$;@) {
END
}
+sub iso_create_empty($$$) {
+ my ($ho,$emptyiso,$emptydir) = @_;
+ my @isogen_opts= qw(-as mkisofs -R -J);
+
+ iso_create_xorriso($ho, $emptyiso, $emptydir, 60, @isogen_opts);
+}
+
sub guest_editconfig_nocd ($$) {
my ($gho,$emptyiso) = @_;
guest_editconfig($gho->{Host}, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index e7e3d73..88fec62 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);
-
- iso_create_xorriso($ho, $emptyiso, $emptydir, 60, @isogen_base);
+ iso_create_empty($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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 08/13] TestSupport.pm: introduce iso_gen_flags_basic
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (6 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 07/13] TestSupport.pm: introduce iso_create_empty Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-02 19:29 ` [PATCH v5 09/13] TestSupport.pm: introduce iso_copy_content_from_image Wei Liu
` (4 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
... 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>
---
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 1b90d17..82d3baa 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -103,6 +103,7 @@ BEGIN {
iso_create_xorriso
iso_create_empty
+ iso_gen_flags_basic
guest_editconfig_nocd
);
%EXPORT_TAGS = ( );
@@ -1919,6 +1920,15 @@ sub iso_create_empty($$$) {
iso_create_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 guest_editconfig_nocd ($$) {
my ($gho,$emptyiso) = @_;
guest_editconfig($gho->{Host}, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index 88fec62..01e3615 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -125,12 +125,7 @@ sub prep () {
iso_create_empty($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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 09/13] TestSupport.pm: introduce iso_copy_content_from_image
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (7 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 08/13] TestSupport.pm: introduce iso_gen_flags_basic Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-02 19:29 ` [PATCH v5 10/13] Debian.pm: factor out preseed_base Wei Liu
` (3 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
... which returns a string of commands to pass into target_cmd_root.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.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 82d3baa..b74422b 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -104,6 +104,7 @@ BEGIN {
iso_create_xorriso
iso_create_empty
iso_gen_flags_basic
+ iso_copy_content_from_image
guest_editconfig_nocd
);
%EXPORT_TAGS = ( );
@@ -1929,6 +1930,19 @@ sub iso_gen_flags_basic() {
-boot-info-table);
}
+sub iso_copy_content_from_image($$) {
+ 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 guest_editconfig_nocd ($$) {
my ($gho,$emptyiso) = @_;
guest_editconfig($gho->{Host}, $gho, sub {
diff --git a/ts-redhat-install b/ts-redhat-install
index 01e3615..924abac 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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 10/13] Debian.pm: factor out preseed_base
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (8 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 09/13] TestSupport.pm: introduce iso_copy_content_from_image Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-02 19:29 ` [PATCH v5 11/13] Introduce ts-debian-hvm-install Wei Liu
` (2 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
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 1ca6fb0..059858e 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) = @_;
@@ -613,45 +690,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
@@ -679,33 +723,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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 11/13] Introduce ts-debian-hvm-install
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (9 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 10/13] Debian.pm: factor out preseed_base Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-03 14:19 ` Ian Jackson
2014-04-02 19:29 ` [PATCH v5 12/13] sg-run-job: OVMF job Wei Liu
2014-04-02 19:29 ` [PATCH v5 13/13] make-flight: OVMF test flight Wei Liu
12 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
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..cf7efcb
--- /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= 6000;
+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 xorriso));
+
+ my $isotimeout= 600;
+
+ $gho= prepareguest($ho, $gn, $guesthost, 22,
+ $disk_mb + 1,
+ 100);
+ my $base = "/root/$flight.$job.$gn-";
+ my $newiso= $base . "newiso";
+ my $emptydir= $base . "empty-dir";
+ my $initrddir= $base . "initrd-dir";
+ my $preseed_file_path = $base . "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);
+
+ iso_create_empty($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 = iso_copy_content_from_image($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");
+
+ iso_create_xorriso($ho, $gho->{Rimage}, $newiso, $isotimeout, @xorriso_opts);
+ });
+}
+
+if (!$stage) {
+ prep();
+ guest_create($gho,$toolstack);
+} else {
+ $gho= selectguest($gn,$gho);
+}
+if ($stage<2) {
+ guest_await_reboot($ho,$gho,2000);
+ guest_destroy($ho,$gho);
+}
+
+guest_editconfig_nocd($gho,$emptyiso);
+guest_create($gho,$toolstack);
+guest_await_dhcp_tcp($gho,300);
+guest_check_up($gho);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 12/13] sg-run-job: OVMF job
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (10 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 11/13] Introduce ts-debian-hvm-install Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-02 19:29 ` [PATCH v5 13/13] make-flight: OVMF test flight Wei Liu
12 siblings, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-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 d894711..d336fbd 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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-02 19:29 [PATCH v5 00/13] OSSTest: OVMF test job Wei Liu
` (11 preceding siblings ...)
2014-04-02 19:29 ` [PATCH v5 12/13] sg-run-job: OVMF job Wei Liu
@ 2014-04-02 19:29 ` Wei Liu
2014-04-03 14:20 ` Ian Jackson
12 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2014-04-02 19:29 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
./mg-show-flight-runvars standalone | grep ovmf | sed 's/[ \t]*$//'
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-amd64-xend enable_ovmf true
build-armhf enable_ovmf true
build-i386 enable_ovmf true
build-i386-xend 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
standalone ovmf_boot_timeout 100
test-amd64-amd64-xl ovmf_boot_timeout 100
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
standalone ovmf_disk_lv ovmf.guest.osstest-disk
test-amd64-amd64-xl ovmf_disk_lv ovmf.guest.osstest-disk
test-amd64-amd64-xl-qemuu-ovmf-amd64 ovmf_disk_lv ovmf.guest.osstest-disk
standalone ovmf_domname ovmf.guest.osstest
test-amd64-amd64-xl ovmf_domname ovmf.guest.osstest
test-amd64-amd64-xl-qemuu-ovmf-amd64 ovmf_domname ovmf.guest.osstest
standalone ovmf_ether 5e:36:06:59:00:02
test-amd64-amd64-xl ovmf_ether 5e:36:06:59:00:03
test-amd64-amd64-xl-qemuu-ovmf-amd64 ovmf_ether 5e:36:06:59:00:01
standalone ovmf_hostname ovmf.guest.osstest
test-amd64-amd64-xl ovmf_hostname ovmf.guest.osstest
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
standalone ovmf_tcpcheckport 22
test-amd64-amd64-xl ovmf_tcpcheckport 22
test-amd64-amd64-xl-qemuu-ovmf-amd64 ovmf_tcpcheckport 22
standalone ovmf_vg cam-st12
test-amd64-amd64-xl ovmf_vg cam-st12
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.83+
test-amd64-amd64-xl-qemuu-ovmf-amd64 xen_kernel_ver 3.4.83+
test-amd64-amd64-xl-qemuu-ovmf-amd64 xenbuildjob build-amd64
test-amd64-i386-xl-qemuu-ovmf-amd64 xenbuildjob build-amd64
---
---
make-flight | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/make-flight b/make-flight
index 39fa7ba..e9b9b75 100755
--- a/make-flight
+++ b/make-flight
@@ -167,6 +167,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
@@ -268,6 +279,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
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-02 19:29 ` [PATCH v5 13/13] make-flight: OVMF test flight Wei Liu
@ 2014-04-03 14:20 ` Ian Jackson
2014-04-03 14:27 ` Wei Liu
2014-04-03 14:34 ` Wei Liu
0 siblings, 2 replies; 26+ messages in thread
From: Ian Jackson @ 2014-04-03 14:20 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.campbell, xen-devel
Wei Liu writes ("[PATCH v5 13/13] make-flight: OVMF test flight"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> ./mg-show-flight-runvars standalone | grep ovmf | sed 's/[ \t]*$//'
...
> standalone ovmf_boot_timeout 100
???
Ian.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-03 14:20 ` Ian Jackson
@ 2014-04-03 14:27 ` Wei Liu
2014-04-03 14:28 ` Wei Liu
2014-04-03 15:17 ` Ian Jackson
2014-04-03 14:34 ` Wei Liu
1 sibling, 2 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-03 14:27 UTC (permalink / raw)
To: Ian Jackson; +Cc: Wei Liu, ian.campbell, xen-devel
On Thu, Apr 03, 2014 at 03:20:54PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH v5 13/13] make-flight: OVMF test flight"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > ---
> > ./mg-show-flight-runvars standalone | grep ovmf | sed 's/[ \t]*$//'
> ...
> > standalone ovmf_boot_timeout 100
Oh, I once manually edited this database. :-(
I did a fresh standalone-reset then ran the same rune. Here's the
result. In fact it's much shorter now.
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 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 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_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 toolstack xl
test-amd64-i386-xl-qemuu-ovmf-amd64 toolstack xl
test-amd64-amd64-xl-qemuu-ovmf-amd64 xenbuildjob build-amd64
test-amd64-i386-xl-qemuu-ovmf-amd64 xenbuildjob build-amd64
Sorry for the confusion.
Wei.
>
> ???
>
> Ian.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-03 14:27 ` Wei Liu
@ 2014-04-03 14:28 ` Wei Liu
2014-04-03 15:17 ` Ian Jackson
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-03 14:28 UTC (permalink / raw)
To: Ian Jackson; +Cc: Wei Liu, ian.campbell, xen-devel
On Thu, Apr 03, 2014 at 03:27:29PM +0100, Wei Liu wrote:
> On Thu, Apr 03, 2014 at 03:20:54PM +0100, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH v5 13/13] make-flight: OVMF test flight"):
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > ---
> > > ./mg-show-flight-runvars standalone | grep ovmf | sed 's/[ \t]*$//'
> > ...
> > > standalone ovmf_boot_timeout 100
>
> Oh, I once manually edited this database. :-(
>
And I will re-run my testing runes in cover letter and report back.
Wei.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-03 14:27 ` Wei Liu
2014-04-03 14:28 ` Wei Liu
@ 2014-04-03 15:17 ` Ian Jackson
2014-04-03 16:19 ` Wei Liu
1 sibling, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2014-04-03 15:17 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.campbell, xen-devel
Wei Liu writes ("Re: [PATCH v5 13/13] make-flight: OVMF test flight"):
> On Thu, Apr 03, 2014 at 03:20:54PM +0100, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH v5 13/13] make-flight: OVMF test flight"):
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > ---
> > > ./mg-show-flight-runvars standalone | grep ovmf | sed 's/[ \t]*$//'
> > ...
> > > standalone ovmf_boot_timeout 100
>
> Oh, I once manually edited this database. :-(
>
> I did a fresh standalone-reset then ran the same rune. Here's the
> result. In fact it's much shorter now.
Good. Thanks. In that case:
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
assuming you adjust the commit message to reflect reality.
I think that's the whole series acked, so could you provide a git
branch somewhere with the acks folded in and this commit message
fixed, and I'll push it.
Thanks,
Ian.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-03 15:17 ` Ian Jackson
@ 2014-04-03 16:19 ` Wei Liu
2014-04-03 16:31 ` Ian Jackson
0 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2014-04-03 16:19 UTC (permalink / raw)
To: Ian Jackson; +Cc: Wei Liu, ian.campbell, xen-devel
On Thu, Apr 03, 2014 at 04:17:07PM +0100, Ian Jackson wrote:
> Wei Liu writes ("Re: [PATCH v5 13/13] make-flight: OVMF test flight"):
> > On Thu, Apr 03, 2014 at 03:20:54PM +0100, Ian Jackson wrote:
> > > Wei Liu writes ("[PATCH v5 13/13] make-flight: OVMF test flight"):
> > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > > ---
> > > > ./mg-show-flight-runvars standalone | grep ovmf | sed 's/[ \t]*$//'
> > > ...
> > > > standalone ovmf_boot_timeout 100
> >
> > Oh, I once manually edited this database. :-(
> >
> > I did a fresh standalone-reset then ran the same rune. Here's the
> > result. In fact it's much shorter now.
>
> Good. Thanks. In that case:
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> assuming you adjust the commit message to reflect reality.
>
> I think that's the whole series acked, so could you provide a git
> branch somewhere with the acks folded in and this commit message
> fixed, and I'll push it.
>
Please pull from:
git://xenbits.xen.org/people/liuw/osstest.git debian-hvm-testcase
Wei.
> Thanks,
> Ian.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-03 16:19 ` Wei Liu
@ 2014-04-03 16:31 ` Ian Jackson
0 siblings, 0 replies; 26+ messages in thread
From: Ian Jackson @ 2014-04-03 16:31 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.campbell, xen-devel
Wei Liu writes ("Re: [PATCH v5 13/13] make-flight: OVMF test flight"):
> On Thu, Apr 03, 2014 at 04:17:07PM +0100, Ian Jackson wrote:
> > I think that's the whole series acked, so could you provide a git
> > branch somewhere with the acks folded in and this commit message
> > fixed, and I'll push it.
>
> Please pull from:
> git://xenbits.xen.org/people/liuw/osstest.git debian-hvm-testcase
Pushed, thanks.
Ian.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v5 13/13] make-flight: OVMF test flight
2014-04-03 14:20 ` Ian Jackson
2014-04-03 14:27 ` Wei Liu
@ 2014-04-03 14:34 ` Wei Liu
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2014-04-03 14:34 UTC (permalink / raw)
To: Ian Jackson; +Cc: Wei Liu, ian.campbell, xen-devel
On Thu, Apr 03, 2014 at 03:20:54PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH v5 13/13] make-flight: OVMF test flight"):
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > ---
> > ./mg-show-flight-runvars standalone | grep ovmf | sed 's/[ \t]*$//'
> ...
> > standalone ovmf_boot_timeout 100
>
And this is because I once ran:
JOBNAME=standalone ts-debian-hvm-install host=cam-st12
which inserted this garbage value into the database.
Wei.
> ???
>
> Ian.
^ permalink raw reply [flat|nested] 26+ messages in thread