thr3ads.net - Xen devel - [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs [Sep 2013]

If this information is useful, please help other people find it:
Share via:

Wei Liu

2013-Sep-20 09:15 UTC

[PATCH OSSTEST 0/6] 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(-)

-- 
1.7.10.4

Wei Liu

2013-Sep-20 09:15 UTC

head link

[PATCH OSSTEST 1/6] README: add curl and netcat to requirement list

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

diff --git a/README b/README
index e9aed52..c845d4d 100644
--- a/README
+++ b/README
@@ -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
-- 
1.7.10.4

Wei Liu

2013-Sep-20 09:15 UTC

head link

[PATCH OSSTEST 2/6] README: describe job dependence

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

diff --git a/README b/README
index c845d4d..7f90696 100644
--- a/README
+++ b/README
@@ -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.
-- 
1.7.10.4

Wei Liu

2013-Sep-20 09:15 UTC

head link

[PATCH OSSTEST 3/6] Osstest: purge Lenny branches

Nowadays we run Squeeze onwards only.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/Debian.pm |    2 --
 ts-host-install   |   10 ----------
 ts-xen-build-prep |    7 -------
 3 files changed, 19 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 3a26571..f6dba9a 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -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);
     }
diff --git a/ts-host-install b/ts-host-install
index dfbc950..12dd77b 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -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");
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index b1e6a6c..bc436b8 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -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 () {
-- 
1.7.10.4

Wei Liu

2013-Sep-20 09:15 UTC

head link

[PATCH OSSTEST 4/6] Debian: install libc6-dev-i386 for Wheezy amd64

Wheezy 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.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 ts-xen-build-prep |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index bc436b8..f7ef5bf 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -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 () {
-- 
1.7.10.4

Wei Liu

2013-Sep-20 09:15 UTC

head link

[PATCH OSSTEST 5/6] ts-debian-fixup: remove dead code

Per c7910040 ("Osstest.pm, toolstack()->; always use "cfg",
not separate
xl configs"), we only pick the config file with .cfg suffix.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 ts-debian-fixup |   18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/ts-debian-fixup b/ts-debian-fixup
index d8b51b7..f001418 100755
--- a/ts-debian-fixup
+++ b/ts-debian-fixup
@@ -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();
-- 
1.7.10.4

Wei Liu

2013-Sep-20 09:15 UTC

head link

[PATCH OSSTEST 6/6] ts-debian-install: pass ''Mb'' as memory size

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 <wei.liu2@citrix.com>
---
 ts-debian-install |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts-debian-install b/ts-debian-install
index 28f95cc..fad2d0c 100755
--- a/ts-debian-install
+++ b/ts-debian-install
@@ -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} \\
-- 
1.7.10.4

Ian Campbell

2013-Sep-23 11:09 UTC

head link

Re: [PATCH OSSTEST 6/6] ts-debian-install: pass ''Mb'' as memory size

On Fri, 2013-09-20 at 10:15 +0100, Wei Liu wrote:> 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 <wei.liu2@citrix.com>
> ---
>  ts-debian-install |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ts-debian-install b/ts-debian-install
> index 28f95cc..fad2d0c 100755
> --- a/ts-debian-install
> +++ b/ts-debian-install
> @@ -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...
>              --dist $gsuite \\
>              --mirror http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath}
\\
>              --hostname $gho->{Name} \\

Wei Liu

2013-Sep-23 11:14 UTC

head link

Re: [PATCH OSSTEST 6/6] ts-debian-install: pass ''Mb'' as memory size

On Mon, Sep 23, 2013 at 12:09:32PM +0100, Ian Campbell
wrote:> On Fri, 2013-09-20 at 10:15 +0100, Wei Liu wrote:
> > 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 <wei.liu2@citrix.com>
> > ---
> >  ts-debian-install |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/ts-debian-install b/ts-debian-install
> > index 28f95cc..fad2d0c 100755
> > --- a/ts-debian-install
> > +++ b/ts-debian-install
> > @@ -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<---
From 3e19bdbd0a60ddb55f9f5427df5c9d32281e361f Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@citrix.com>
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.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 ts-debian-install |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts-debian-install b/ts-debian-install
index 28f95cc..519edc9 100755
--- a/ts-debian-install
+++ b/ts-debian-install
@@ -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} \\
-- 
1.7.10.4

Ian Campbell

2013-Sep-23 13:13 UTC

head link

Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches

On Fri, 2013-09-20 at 10:15 +0100, Wei Liu wrote:> 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.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
>  Osstest/Debian.pm |    2 --
>  ts-host-install   |   10 ----------
>  ts-xen-build-prep |    7 -------
>  3 files changed, 19 deletions(-)
> 
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index 3a26571..f6dba9a 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -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);
>      }
> diff --git a/ts-host-install b/ts-host-install
> index dfbc950..12dd77b 100755
> --- a/ts-host-install
> +++ b/ts-host-install
> @@ -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");
> diff --git a/ts-xen-build-prep b/ts-xen-build-prep
> index b1e6a6c..bc436b8 100755
> --- a/ts-xen-build-prep
> +++ b/ts-xen-build-prep
> @@ -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 () {

Ian Jackson

2013-Oct-11 11:43 UTC

head link

Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches

Ian Campbell writes ("Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny
branches"):> On Fri, 2013-09-20 at 10:15 +0100, Wei Liu wrote:
> > 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.

Wei Liu

2013-Oct-11 11:59 UTC

head link

Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches

On Fri, Oct 11, 2013 at 12:43:49PM +0100, Ian Jackson
wrote:> Ian Campbell writes ("Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny
branches"):
> > On Fri, 2013-09-20 at 10:15 +0100, Wei Liu wrote:
> > > 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.
> 
Feel free to drop this one.
> ian.

Wei Liu

2013-Oct-14 14:40 UTC

head link

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

On Fri, Sep 20, 2013 at 10:15:40AM +0100, Wei Liu wrote:> 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?

Ian Jackson

2013-Oct-14 16:54 UTC

head link

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

Wei Liu writes ("Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable
Wheezy to run test jobs"):> On Fri, Sep 20, 2013 at 10:15:40AM +0100, Wei Liu wrote:
> > 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?
Please, or better still can you push them somewhere I can fetch them ?

Thanks,
Ian.

Wei Liu

2013-Oct-14 17:05 UTC

head link

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

On Mon, Oct 14, 2013 at 05:54:28PM +0100, Ian Jackson
wrote:> Wei Liu writes ("Re: [PATCH OSSTEST 0/6] Improvement, cleanup and
enable Wheezy to run test jobs"):
> > On Fri, Sep 20, 2013 at 10:15:40AM +0100, Wei Liu wrote:
> > > 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?
> 
> Please, or better still can you push them somewhere I can fetch them ?
> 
git://xenbits.xen.org/people/liuw/osstest.git for-ianj
> Thanks,
> Ian.

Ian Jackson

2013-Oct-14 17:10 UTC

head link

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

Wei Liu writes ("Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable
Wheezy to run test jobs"):> git://xenbits.xen.org/people/liuw/osstest.git for-ianj
Thanks.  I have pushed this to the osstest pretest branch.  I''ll let
you know how it does :-).

Ian.

Xen devel - Sep 2013 - [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

[PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

[PATCH OSSTEST 1/6] README: add curl and netcat to requirement list

[PATCH OSSTEST 2/6] README: describe job dependence

[PATCH OSSTEST 3/6] Osstest: purge Lenny branches

[PATCH OSSTEST 4/6] Debian: install libc6-dev-i386 for Wheezy amd64

[PATCH OSSTEST 5/6] ts-debian-fixup: remove dead code

[PATCH OSSTEST 6/6] ts-debian-install: pass ''Mb'' as memory size

Re: [PATCH OSSTEST 6/6] ts-debian-install: pass ''Mb'' as memory size

Re: [PATCH OSSTEST 6/6] ts-debian-install: pass ''Mb'' as memory size

Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches

Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches

Re: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs

Re: [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs