From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= Subject: Re: [xen-unstable test] 22184: regressions - trouble: broken/fail/pass Date: Mon, 2 Dec 2013 16:22:53 +0100 Message-ID: <529CA5CD.5090709@citrix.com> References: <5299C445.5070100@citrix.com> <1385810426.23632.41.camel@dagon.hellion.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <1385810426.23632.41.camel@dagon.hellion.org.uk> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: xen-devel@lists.xensource.com, "xen.org" List-Id: xen-devel@lists.xenproject.org On 30/11/13 12:20, Ian Campbell wrote: > On Sat, 2013-11-30 at 11:56 +0100, Roger Pau Monn=E9 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. v= s. 22106 >>> test-amd64-i386-xl-win7-amd64 9 guest-localmigrate fail REGR. v= s. 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 ne= ver 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) =3D @_; - - my $vg =3D "$ho->{Name}"; - # Dashes are escaped in the VG name - $vg =3D~ s/-/--/g; - return "/dev/mapper/$vg-$lv"; -} - sub setupboot_uboot ($$$) { my ($ho,$want_kernver,$xenhopt,$xenkopt) =3D @_; my $bl=3D { }; @@ -131,7 +122,7 @@ sub setupboot_uboot ($$$) { my $kern =3D "vmlinuz-$want_kernver"; my $initrd =3D "initrd.img-$want_kernver"; = - my $root=3D lvm_lv_name($ho,"root"); + my $root=3D 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=3Dlvm_lv_name($ho,"root"); + my $root=3Dtarget_guest_lv_name($ho,"root"); = preseed_hook_command($ho, 'late_command', $sfx, <{Name}"; + # Dashes are escaped in the VG name + $vg =3D~ 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 =3D "/dev/mapper/$gho->{Vg}-$gho->{Name}--disk3"; + my $rootpartition_dev =3D target_guest_lv_name($ho, $gho->{Name}) . "-= -disk3"; = target_cmd_root($ho, "umount $gho->{Lvdev} ||:"); =