Improvement, cleanup and enable Wheezy to run test jobs
cover Improvement, cleanup and enable Wheezy to run test jobs
Hi Ian and Ian
The first two patches are improvements to README.
The third and fifth patches are cleanup.
The fourth patch fix Wheezy to run build-amd64.
The last patch enables Wheezy to run test-amd64-amd64-{xl,pv}.
Wei Liu (6):
README: add curl and netcat to requirement list
README: describe job dependence
Osstest: purge Lenny branches
Debian: install libc6-dev-i386 for Wheezy amd64
ts-debian-fixup: remove dead code
ts-debian-install: pass 'Mb' as memory size
Osstest/Debian.pm | 2 -- README | 8 ++++++++ ts-debian-fixup | 18 ------------------ ts-debian-install | 2 +- ts-host-install | 10 ---------- ts-xen-build-prep | 7 ++----- 6 files changed, 11 insertions(+), 36 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/6 README: add curl and netcat to requirement list
--- README | 2 ++ 1 file changed, 2 insertions(+)
README +2 -0
@@ -5,6 +5,8 @@ To run osstest in standalone mode: tcl8.4 tclx8.4 libsqlite3-tcl libdbi-perl libdbd-sqlite3-perl pax rsync + curl + netcat - Write a config file ~/.xen-osstest/config
Signature · 1 line
1.7.10.4
PATCH 2/6 README: describe job dependence
In reply to Wei Liu--- README | 6 ++++++ 1 file changed, 6 insertions(+)
README +6 -0
@@ -33,6 +33,12 @@ To run osstest in standalone mode: (strictly, the final `_HOST' is the uppercase of the host's `ident' in the job) + However, as test-amd64-{i386,amd64}-xl and other tests depends on + some runtime variables generated by build-* jobs, you can run + build-* jobs before running actual test jobs. If you don't want to do + so you need to insert those missing runvars into standalone.db with + sqlite3. + - Don't forget to set the machine to pxeboot in the BIOS. - Currently you need a serial console at 115200 8n1; see TODO.
Signature · 1 line
1.7.10.4
PATCH 3/6 Osstest: purge Lenny branches
In reply to Wei LiuNowadays we run Squeeze onwards only.
--- Osstest/Debian.pm | 2 -- ts-host-install | 10 ---------- ts-xen-build-prep | 7 ------- 3 files changed, 19 deletions(-)
Osstest/Debian.pm +0 -2
@@ -72,8 +72,6 @@ sub debian_boot_setup ($$$$;$) { my $bootloader; if ( $ho->{Flags}{'need-uboot-bootscr'} ) { $bootloader= setupboot_uboot($ho, $want_kernver, $xenhopt, $kopt); - } elsif ($ho->{Suite} =~ m/lenny/) { - $bootloader= setupboot_grub1($ho, $want_kernver, $xenhopt, $kopt); } else { $bootloader= setupboot_grub2($ho, $want_kernver, $xenhopt, $kopt); }
ts-host-install +0 -10
@@ -72,16 +72,6 @@ END our $vgname= $ho->{Name}; - if ($ho->{Suite} =~ m/lenny/) { - $vgname .= ".$c{TestHostDomain}"; - target_editfile_root($ho, '/boot/grub/menu.lst', sub { - while (<EI>) { - s/^terminal.*/terminal --timeout=10 serial console/; - print EO or die $!; - } - }); - } - my $lvs= target_cmd_output_root($ho, 'lvdisplay --colon'); foreach my $l (split /\n/, $lvs) { logm("| $l");
ts-xen-build-prep +0 -7
@@ -174,13 +174,6 @@ sub prep () { target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates"); # workaround for Debian #595728 - - if ($ho->{Suite} !~ m/lenny/) { - target_putfilecontents_stash($ho,60,<<'END','/home/osstest/.hgrc'); -[extensions] -mq= -END - } } sub cacheing_git_mount () {
Signature · 1 line
1.7.10.4
Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches
Quoted 1 line · Wei Liu
Nowadays we run Squeeze onwards only.
While I'm pretty sure this is correct I think it's not urgent and I'd rather wait for Ian Jackson to return rather than committing this sort of thing myself.
Quoted 60 lines
Signed-off-by Wei Liu <[email protected]>--- Osstest/Debian.pm | 2 -- ts-host-install | 10 ---------- ts-xen-build-prep | 7 ------- 3 files changed, 19 deletions(-)Osstest/Debian.pm +0
-2@@ -72,8 +72,6 @@ sub debian_boot_setup ($$$$;$) { my $bootloader; if ( $ho->{Flags}{'need-uboot-bootscr'} ) { $bootloader= setupboot_uboot($ho, $want_kernver, $xenhopt, $kopt); - } elsif ($ho->{Suite} =~ m/lenny/) { - $bootloader= setupboot_grub1($ho, $want_kernver, $xenhopt, $kopt); } else { $bootloader= setupboot_grub2($ho, $want_kernver, $xenhopt, $kopt); }ts-host-install +0
-10@@ -72,16 +72,6 @@ END our $vgname= $ho->{Name}; - if ($ho->{Suite} =~ m/lenny/) { - $vgname .= ".$c{TestHostDomain}"; - target_editfile_root($ho, '/boot/grub/menu.lst', sub { - while (<EI>) { - s/^terminal.*/terminal --timeout=10 serial console/; - print EO or die $!; - } - }); - } - my $lvs= target_cmd_output_root($ho, 'lvdisplay --colon'); foreach my $l (split /\n/, $lvs) { logm("| $l");ts-xen-build-prep +0
-7@@ -174,13 +174,6 @@ sub prep () { target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates"); # workaround for Debian #595728 - - if ($ho->{Suite} !~ m/lenny/) { - target_putfilecontents_stash($ho,60,<<'END','/home/osstest/.hgrc'); -[extensions] -mq= -END - } } sub cacheing_git_mount () {
Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches
Ian Campbell writes ("Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches"):
Quoted 6 lines · Wei Liu
Quoted 1 line
Nowadays we run Squeeze onwards only.
While I'm pretty sure this is correct I think it's not urgent and I'd rather wait for Ian Jackson to return rather than committing this sort of thing myself.
TBH I would normally continue carry this kind of code for a while longer, in case there's anyone out there who might be running something earlier.
ian.
Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches
Quoted 4 lines · Ian Jackson
Ian Campbell writes ("Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches"):
Quoted 3 lines · Wei Liu
Quoted 1 line
Nowadays we run Squeeze onwards only.
Quoted 8 lines
Quoted 3 lines
While I'm pretty sure this is correct I think it's not urgent and I'd rather wait for Ian Jackson to return rather than committing this sort of thing myself.
TBH I would normally continue carry this kind of code for a while longer, in case there's anyone out there who might be running something earlier.
Feel free to drop this one.
Quoted 1 line
ian.
PATCH 4/6 Debian: install libc6-dev-i386 for Wheezy amd64
In reply to Wei LiuWheezy introduces multilib, which makes i386 headers not available on amd64 by default.
We need to install libc6-dev-i386, otherwise the test code for 32bit instruction decoder/emulator fails.
--- ts-xen-build-prep | 4 ++++ 1 file changed, 4 insertions(+)
ts-xen-build-prep +4 -0
@@ -174,6 +174,10 @@ sub prep () { target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates"); # workaround for Debian #595728 + + if ($r{arch} eq 'amd64' && $ho->{Suite} =~ m/wheezy/) { + target_install_packages($ho, 'libc6-dev-i386'); + } } sub cacheing_git_mount () {
Signature · 1 line
1.7.10.4
PATCH 5/6 ts-debian-fixup: remove dead code
In reply to Wei LiuPer c7910040 ("Osstest.pm, toolstack()->; always use "cfg", not separate xl configs"), we only pick the config file with .cfg suffix.
--- ts-debian-fixup | 18 ------------------ 1 file changed, 18 deletions(-)
ts-debian-fixup +0 -18
@@ -163,23 +163,6 @@ sub writecfg () { target_putfile_root($ho,10, $cfgstash, $cfgfile); } -sub xlcfg () { - my $cfg_xend= target_var($gho,'cfgpath'); - my $cfg_xl= "/etc/xen/$gho->{Name}.xl"; - store_runvar("$gho->{Guest}_xlpath", $cfg_xl); - target_editfile_root($ho, $cfg_xend, undef, $cfg_xl, sub { - local ($/)= undef; - $_= <EI>; - s/^ [ \t]* memory [ \t]* \= [ \t]* ['"] (.+) ['"] [ \t]* - $/memory=$1/mx; - s/([[,])\s*\n/$1/g; - s/,\s*\]/\]/g; - s/([^#\n].*)\n/$1;\n/mg; - s/\n\n+/\n/g; - print EO or die $!; - }); -} - savecfg(); ether(); target_kernkind_check($gho);
@@ -188,5 +171,4 @@ console(); filesystems(); otherfixupcfg(); writecfg(); -xlcfg(); unmount();
Signature · 1 line
1.7.10.4
PATCH 6/6 ts-debian-install: pass 'Mb' as memory size
In reply to Wei LiuThe original code passed 'M' which triggers Debian bug #691320 in Wheezy.
Passing 'Mb' should work both for Squeeze and Wheezy.
--- ts-debian-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ts-debian-install +1 -1
@@ -66,7 +66,7 @@ sub ginstall () { target_cmd_root($ho, <<END, 2000); xen-create-image \\ --dhcp --mac $gho->{Ether} \\ - --memory ${ram_mb}M --swap ${swap_mb}M \\ + --memory ${ram_mb}Mb --swap ${swap_mb}M \\ --dist $gsuite \\ --mirror http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} \\ --hostname $gho->{Name} \\
Signature · 1 line
1.7.10.4
Re: [PATCH OSSTEST 6/6] ts-debian-install: pass 'Mb' as memory size
Quoted 15 lines · Wei Liu
The original code passed 'M' which triggers Debian bug #691320 in Wheezy.
Passing 'Mb' should work both for Squeeze and Wheezy.
Signed-off-by Wei Liu <[email protected]>--- ts-debian-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)ts-debian-install +0
-0
ts-debian-install sub ginstall () { · line 69
Quoted 5 lines
ts-debian-install +1
-1@@ -66,7 +66,7 @@ sub ginstall () { target_cmd_root($ho, <<END, 2000); xen-create-image \\ --dhcp --mac $gho->{Ether} \\ - --memory ${ram_mb}M --swap ${swap_mb}M \\ + --memory ${ram_mb}Mb --swap ${swap_mb}M \\
The docs use Mb etc for --swap too. I think we should be consistent...
Quoted 3 lines
ts-debian-install +0
-0--dist $gsuite \\ --mirror http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} \\ --hostname $gho->{Name} \\
Re: [PATCH OSSTEST 6/6] ts-debian-install: pass 'Mb' as memory size
Quoted 11 lines · Ian Campbell
Quoted 10 lines · Wei Liu
The original code passed 'M' which triggers Debian bug #691320 in Wheezy.
Passing 'Mb' should work both for Squeeze and Wheezy.
Signed-off-by Wei Liu <[email protected]>--- ts-debian-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
ts-debian-install sub ginstall () { · line 69
Quoted 10 lines
ts-debian-install +1
-1@@ -66,7 +66,7 @@ sub ginstall () { target_cmd_root($ho, <<END, 2000); xen-create-image \\ --dhcp --mac $gho->{Ether} \\ - --memory ${ram_mb}M --swap ${swap_mb}M \\ + --memory ${ram_mb}Mb --swap ${swap_mb}M \\The docs use Mb etc for --swap too. I think we should be consistent...
Sure, updated patch.
----8<---
Quoted 1 line
From
3e19bdbd0a60ddb55f9f5427df5c9d32281e361fMon Sep 17 00:00:00 2001
From: Wei Liu <[email protected]>
Date: Fri, 20 Sep 2013 09:49:50 +0100
Subject: [PATCH] ts-debian-install: pass 'Mb' as memory / swap size
The original code passed 'M' to memory which triggers Debian bug #691320 in Wheezy.
Passing 'Mb' should work both for Squeeze and Wheezy.
Also pass 'Mb' to swap size for consistency.
--- ts-debian-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ts-debian-install +1 -1
@@ -66,7 +66,7 @@ sub ginstall () { target_cmd_root($ho, <<END, 2000); xen-create-image \\ --dhcp --mac $gho->{Ether} \\ - --memory ${ram_mb}M --swap ${swap_mb}M \\ + --memory ${ram_mb}Mb --swap ${swap_mb}Mb \\ --dist $gsuite \\ --mirror http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} \\ --hostname $gho->{Name} \\
Signature · 1 line
1.7.10.4
Quoted 10 lines · Wei Liu
Hi Ian and Ian
The first two patches are improvements to README.
The third and fifth patches are cleanup.
The fourth patch fix Wheezy to run build-amd64.
The last patch enables Wheezy to run test-amd64-amd64-{xl,pv}.
IanJ, do you want me to resend this series with #3 (purge Lenny branch) dropped?
Wei Liu writes ("Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs"):
Quoted 5 lines · Wei Liu
Quoted 4 lines
Hi Ian and Ian
The first two patches are improvements to README.
Quoted 8 lines
Quoted 5 lines
The third and fifth patches are cleanup.
The fourth patch fix Wheezy to run build-amd64.
The last patch enables Wheezy to run test-amd64-amd64-{xl,pv}.
IanJ, do you want me to resend this series with #3 (purge Lenny branch) dropped?
Please, or better still can you push them somewhere I can fetch them ?
Thanks,
Ian.
Quoted 8 lines · Ian Jackson
Wei Liu writes ("Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs"):
Quoted 7 lines · Wei Liu
Quoted 6 lines
Hi Ian and Ian
The first two patches are improvements to README.
The third and fifth patches are cleanup.
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
The fourth patch fix Wheezy to run build-amd64.
The last patch enables Wheezy to run test-amd64-amd64-{xl,pv}.
IanJ, do you want me to resend this series with #3 (purge Lenny branch) dropped?
Please, or better still can you push them somewhere I can fetch them ?
git://xenbits.xen.org/people/liuw/osstest.git for-ianj
Quoted 2 lines
Thanks,
Ian.
Wei Liu writes ("Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs"):
Quoted 1 line
git://xenbits.xen.org/people/liuw/osstest.gitfor-ianj
Thanks. I have pushed this to the osstest pretest branch. I'll let you know how it does :-).
Ian.