xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>,
	Ian Campbell <ian.campbell@citrix.com>
Subject: [OSSTEST PATCH 20/26] ts-debian-hvm-install: Set $gsuite after $gho
Date: Fri, 18 Sep 2015 18:50:10 +0100	[thread overview]
Message-ID: <1442598616-2884-7-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1442598616-2884-1-git-send-email-ian.jackson@eu.citrix.com>

$gsuite was set from guest_var, but before $gho was set, leading to an
undefined value warning from Perl.

This would ignore any guest-specific suite runvars.  AFAICT these are
set by some of the jobs in make-distros-flight.  I think the effect of
this change is to apply workarounds for the intended suite, rather
than for wheezy.

(Although there is another assignment to $gho later in
ts-debian-hvm-install, for stage 2, the stage 2 code does some trivial
TestSupport calls and does not need $gsuite.  So there is no need to
make arrangements to assign to $gsuite - or, for that matter, $kernel
or $ramdisk, in that path.)

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ts-debian-hvm-install |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 71ab1a5..fb07293 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -50,7 +50,7 @@ our $gho;
 
 our ($kernel, $ramdisk);
 
-our $gsuite= guest_var($gho,'suite',$c{GuestDebianSuite});
+our $gsuite;
 
 sub preseed () {
 
@@ -187,6 +187,7 @@ sub prep () {
                        $disk_mb + 1,
                        200);
 
+    $gsuite = guest_var($gho,'suite',$c{GuestDebianSuite});
     $kernel = iso_path('kernel', 'vmlinuz');
     $ramdisk = iso_path('ramdisk', 'initrd.gz');
 
-- 
1.7.10.4

  parent reply	other threads:[~2015-09-18 17:50 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-18 17:50 [OSSTEST PATCH v3 00/15-26] xen.git#staging smoke tests Ian Jackson
2015-09-18 17:50 ` [OSSTEST PATCH 15/26] cr*: Support xen-unstable-smoke Ian Jackson
2015-09-21  9:17   ` Ian Campbell
2015-09-21 10:21     ` Ian Jackson
2015-09-21 10:32       ` Ian Campbell
2015-09-21 10:53         ` Ian Jackson
2015-09-18 17:50 ` [OSSTEST PATCH 16/26] ap-*: Be able to fetch and push xen.git#smoke Ian Jackson
2015-09-18 17:50 ` [OSSTEST PATCH 17/26] crontab: Enable xen-unstable-smoke branch every 3h at <1mod3>:51 UTC Ian Jackson
2015-09-18 17:50 ` [OSSTEST PATCH 18/26] ts-debian-hvm-install, etc.: Do not hardcode in-iso path Ian Jackson
2015-09-21  9:19   ` Ian Campbell
2015-09-18 17:50 ` [OSSTEST PATCH 19/26] ts-debian-hvm-install: Cope with images containing only isolinux Ian Jackson
2015-09-21  9:28   ` Ian Campbell
2015-09-21 10:35     ` Ian Jackson
2015-09-21 14:30       ` Ian Jackson
2015-09-18 17:50 ` Ian Jackson [this message]
2015-09-21  9:29   ` [OSSTEST PATCH 20/26] ts-debian-hvm-install: Set $gsuite after $gho Ian Campbell
2015-09-18 17:50 ` [OSSTEST PATCH 21/26] ts-debian-hvm-install: Do not create EFI partition if EFI not in use Ian Jackson
2015-09-21  9:32   ` Ian Campbell
2015-09-21 10:36     ` Ian Jackson
2015-09-21 10:41     ` Ian Jackson
2015-09-18 17:50 ` [OSSTEST PATCH 22/26] ts-debian-hvm-install: Use /dev/sda for i386, not /dev/xvda Ian Jackson
2015-09-21  9:40   ` Ian Campbell
2015-09-21 10:38     ` Ian Jackson
2015-09-18 17:50 ` [OSSTEST PATCH 23/26] Timeouts: Introduce target_adjust_timeout Ian Jackson
2015-09-21  9:41   ` Ian Campbell
2015-09-18 17:50 ` [OSSTEST PATCH 24/26] Timeouts: Honour guest-related timeout-adjustment runvars Ian Jackson
2015-09-21  9:43   ` Ian Campbell
2015-09-18 17:50 ` [OSSTEST PATCH 25/26] Debian i386 HVM tests: Increase installation timeout Ian Jackson
2015-09-21  9:43   ` Ian Campbell
2015-09-18 17:50 ` [OSSTEST PATCH 26/26] cri-common: Add a missing semicolon Ian Jackson
2015-09-21  9:44   ` Ian Campbell

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=1442598616-2884-7-git-send-email-ian.jackson@eu.citrix.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=xen-devel@lists.xenproject.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).