From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH RFC OSSTEST v1 08/12] make-flight: Set diversion runvar on d-i based test jobs. Date: Fri, 8 Jan 2016 14:29:55 +0000 Message-ID: <1452263399-14094-8-git-send-email-ian.campbell@citrix.com> References: <1452263368.29416.39.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1452263368.29416.39.camel@citrix.com> 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.jackson@eu.citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org Note that make-distros-flight does not want this, since it uses d-i fetched from the web not the version in our config. Signed-off-by: Ian Campbell --- make-flight | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/make-flight b/make-flight index 50abf97..3b3950a 100755 --- a/make-flight +++ b/make-flight @@ -31,6 +31,8 @@ flight=`./cs-flight-create $blessing $branch` . ./ap-common . ./mfi-common +guestdiversion=`getconfig TftpDiVersion` + case "$branch" in xen-unstable-smoke) global_runvars+=" hostalloc_maxbonus_variation~=0 " @@ -430,6 +432,7 @@ do_pygrub_tests () { test-debian-di xl $xenarch $dom0arch \ debian_arch=amd64 \ debian_suite=$guestsuite \ + debian_diversion=$guestdiversion \ debian_method=netboot \ debian_bootloader=pygrub \ all_hostflags=$most_hostflags @@ -444,6 +447,7 @@ do_pvgrub_tests () { test-debian-di xl $xenarch $dom0arch \ debian_arch=amd64 \ debian_suite=$guestsuite \ + debian_diversion=$guestdiversion \ debian_method=netboot \ debian_bootloader=pvgrub \ all_hostflags=$most_hostflags \ @@ -452,6 +456,7 @@ do_pvgrub_tests () { test-debian-di xl $xenarch $dom0arch \ debian_arch=i386 \ debian_suite=$guestsuite \ + debian_diversion=$guestdiversion \ debian_method=netboot \ debian_bootloader=pvgrub \ all_hostflags=$most_hostflags -- 2.6.1