Re: [xen-unstable test] 22184: regressions - trouble: broken/fail/pass

["Roger Pau Monné" <roger.pau@citrix.com>]

On 30/11/13 12:20, Ian Campbell wrote:
> On Sat, 2013-11-30 at 11:56 +0100, Roger Pau Monné wrote:
>> On 30/11/13 04:44, xen.org wrote:
>>> flight 22184 xen-unstable real [real]
>>> http://www.chiark.greenend.org.uk/~xensrcts/logs/22184/
>>>
>>> Regressions :-(
>>>
>>> Tests which did not succeed and are blocking,
>>> including tests which could not be run:
>>>  test-amd64-amd64-xl-qemuu-winxpsp3  7 windows-install     fail REGR. vs. 22106
>>>  test-amd64-i386-xl-win7-amd64  9 guest-localmigrate       fail REGR. vs. 22106
>>>
>>> Regressions which are regarded as allowable (not blocking):
>>>  test-amd64-i386-freebsd10-i386  3 host-install(3)      broken blocked in 22106
>>>
>>> Tests which did not succeed, but are not blocking:
>>>  test-amd64-i386-freebsd10-amd64  7 freebsd-install             fail never pass
>>
>> By looking at the logs it seems like if the VG name has '-' on it they 
>> get replaced to '--' by the device mapper, so the right path should be:
>>
>> /dev/mapper/lake--frog-freebsd.guest.osstest--disk3
>>
>> I have a completely untested patch to fix this (I also have to say my 
>> perl skills are really limited, so probably there's a better way to do 
>> this):
> 
> You can/should probably abstract Osstest::Debian.pm:lvm_lv_name() into a
> more common location.

I've moved it to TestSupport:

---
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index e51a233..6759263 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -111,15 +111,6 @@ sub bl_getmenu_open ($$$) {
     return $f;
 }
 
-sub lvm_lv_name($$) {
-    my ($ho, $lv) = @_;
-
-    my $vg = "$ho->{Name}";
-    # Dashes are escaped in the VG name
-    $vg =~ s/-/--/g;
-    return "/dev/mapper/$vg-$lv";
-}
-
 sub setupboot_uboot ($$$) {
     my ($ho,$want_kernver,$xenhopt,$xenkopt) = @_;
     my $bl= { };
@@ -131,7 +122,7 @@ sub setupboot_uboot ($$$) {
 	my $kern = "vmlinuz-$want_kernver";
 	my $initrd = "initrd.img-$want_kernver";
 
-	my $root= lvm_lv_name($ho,"root");
+	my $root= target_guest_lv_name($ho,"root");
 
 	logm("Xen options: $xenhopt");
 	logm("Linux options: $xenkopt");
@@ -590,7 +581,7 @@ END
     }
 
     if ( $ho->{Flags}{'need-uboot-bootscr'} ) {
-	my $root=lvm_lv_name($ho,"root");
+	my $root=target_guest_lv_name($ho,"root");
 
 	preseed_hook_command($ho, 'late_command', $sfx, <<END);
 #!/bin/sh
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 233d453..0398416 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -57,7 +57,7 @@ BEGIN {
                       target_put_guest_image
                       target_editfile_root target_file_exists
                       target_install_packages target_install_packages_norec
-                      target_extract_jobdistpath
+                      target_extract_jobdistpath target_guest_lv_name
 
                       poll_loop tcpconnect await_tcp
                       contents_make_cpio file_simple_write_contents
@@ -607,6 +607,15 @@ sub poll_loop ($$$&) {
     logm("$what: ok. (${waited}s)");
 }
 
+sub target_guest_lv_name($$) {
+    my ($ho, $lv) = @_;
+
+    my $vg = "$ho->{Name}";
+    # Dashes are escaped in the VG name
+    $vg =~ s/-/--/g;
+    return "/dev/mapper/$vg-$lv";
+}
+
 #---------- dhcp watching ----------
 
 sub dhcp_watch_setup ($$) {
diff --git a/ts-freebsd-install b/ts-freebsd-install
index 470fb83..6c6abbe 100755
--- a/ts-freebsd-install
+++ b/ts-freebsd-install
@@ -67,7 +67,7 @@ sub prep () {
 			    ? $r{"$gho->{Guest}_arch"} : 'amd64').
 			   ".qcow2.xz");
 				
-    my $rootpartition_dev = "/dev/mapper/$gho->{Vg}-$gho->{Name}--disk3";
+    my $rootpartition_dev = target_guest_lv_name($ho, $gho->{Name}) . "--disk3";
 
     target_cmd_root($ho, "umount $gho->{Lvdev} ||:");