xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
	ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [PATCH OSSTEST 3/6] Osstest: purge Lenny branches
Date: Fri, 20 Sep 2013 10:15:43 +0100	[thread overview]
Message-ID: <1379668546-5267-4-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1379668546-5267-1-git-send-email-wei.liu2@citrix.com>

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

  parent reply	other threads:[~2013-09-20  9:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-20  9:15 [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs Wei Liu
2013-09-20  9:15 ` [PATCH OSSTEST 1/6] README: add curl and netcat to requirement list Wei Liu
2013-09-20  9:15 ` [PATCH OSSTEST 2/6] README: describe job dependence Wei Liu
2013-09-20  9:15 ` Wei Liu [this message]
2013-09-23 13:13   ` [PATCH OSSTEST 3/6] Osstest: purge Lenny branches Ian Campbell
2013-10-11 11:43     ` Ian Jackson
2013-10-11 11:59       ` Wei Liu
2013-09-20  9:15 ` [PATCH OSSTEST 4/6] Debian: install libc6-dev-i386 for Wheezy amd64 Wei Liu
2013-09-20  9:15 ` [PATCH OSSTEST 5/6] ts-debian-fixup: remove dead code Wei Liu
2013-09-20  9:15 ` [PATCH OSSTEST 6/6] ts-debian-install: pass 'Mb' as memory size Wei Liu
2013-09-23 11:09   ` Ian Campbell
2013-09-23 11:14     ` Wei Liu
2013-10-14 14:40 ` [PATCH OSSTEST 0/6] Improvement, cleanup and enable Wheezy to run test jobs Wei Liu
2013-10-14 16:54   ` Ian Jackson
2013-10-14 17:05     ` Wei Liu
2013-10-14 17:10       ` Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1379668546-5267-4-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).