From patchwork Mon Jan 18 14:28:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8055101 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 29C8EBEEE5 for ; Mon, 18 Jan 2016 14:32:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EA6020439 for ; Mon, 18 Jan 2016 14:32:04 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54742203A9 for ; Mon, 18 Jan 2016 14:32:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aLAoC-0001cz-1d; Mon, 18 Jan 2016 14:29:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aLAo9-0001YQ-Cr for xen-devel@lists.xen.org; Mon, 18 Jan 2016 14:29:25 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 91/D1-22089-4C6FC965; Mon, 18 Jan 2016 14:29:24 +0000 X-Env-Sender: prvs=818d0ce80=Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1453127362!16541266!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45461 invoked from network); 18 Jan 2016 14:29:23 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 18 Jan 2016 14:29:23 -0000 X-IronPort-AV: E=Sophos;i="5.22,312,1449532800"; d="scan'208";a="332157295" From: Ian Campbell To: , Date: Mon, 18 Jan 2016 14:28:57 +0000 Message-ID: <1453127337-16136-12-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1453127319.6020.156.camel@citrix.com> References: <1453127319.6020.156.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v2 12/12] make-flight: Use older Debian for host and guest OS with older Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sometimes when updating osstest to use a newer version of Debian as a baseline we find that the new compiler or other tools pickup latent errors in older code bases for which the fixes are invasive or otherwise inappropriate for a stable branch. This is the case with Debian Jessie and Xen 4.3 and earlier, so restrict those branches to keep using Wheezy. This only applies to xen-X.Y-testing branches and qemu-upstream-X.Y-testing branches since other branch all use xen-unstable as their Xen. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v2: Cope with un-abolishing $defsuite and $defguestsuite. Dropped Ack. Runvar differences are of the form: -xen-4.3-testing build-amd64 all_host_di_version 2015-09-18 -xen-4.3-testing build-amd64 all_host_suite jessie +xen-4.3-testing build-amd64 all_host_di_version 2015-09-07 +xen-4.3-testing build-amd64 all_host_suite wheezy xen-4.3-testing build-amd64 arch amd64 -xen-4.3-testing build-amd64 host_hostflags share-build-jessie-amd64,arch-amd64,suite-jessie,purpose-build +xen-4.3-testing build-amd64 host_hostflags share-build-wheezy-amd64,arch-amd64,suite-wheezy,purpose-build Or for a test which uses d-i: -xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_di_version 2015-09-18 -xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_hostflags arch-amd64,arch-xen-amd64,suite-jessie,purpose-test -xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_suite jessie +xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_di_version 2015-09-07 +xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test +xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_suite wheezy xen-4.3-testing test-amd64-amd64-amd64-pvgrub arch amd64 xen-4.3-testing test-amd64-amd64-amd64-pvgrub buildjob build-amd64 xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_arch amd64 xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_bootloader pvgrub -xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_di_version 2015-09-18 +xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_di_version 2015-09-07 xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_method netboot -xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_suite jessie +xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_suite wheezy xen-4.3-testing test-amd64-amd64-amd64-pvgrub kernbuildjob build-amd64-pvops xen-4.3-testing test-amd64-amd64-amd64-pvgrub kernkind pvops xen-4.3-testing test-amd64-amd64-amd64-pvgrub toolstack xl xen-4.3-testing test-amd64-amd64-amd64-pvgrub xenbuildjob build-amd64 --- make-flight | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/make-flight b/make-flight index 885870c..8acfcb9 100755 --- a/make-flight +++ b/make-flight @@ -31,8 +31,21 @@ flight=`./cs-flight-create $blessing $branch` . ./ap-common . ./mfi-common -defsuite=`getconfig DebianSuite` -defguestsuite=`getconfig GuestDebianSuite` +# Older versions of Xen may not build with the current default. Note +# that branches older than 4.3 might need something even older than +# Wheezy, but we have not done the archaeology to figure out what they +# require. +case "$xenbranch" in + xen-3.*-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.0-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.1-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.2-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.3-testing) defsuite="wheezy"; defguestsuite="wheezy";; + *) + defsuite=`getconfig DebianSuite` + defguestsuite=`getconfig GuestDebianSuite` + ;; +esac # Pick default Debian Installer version to correspond to the chosen # suite.