From patchwork Tue Jul 25 11:57:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9861897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F13B76038F for ; Tue, 25 Jul 2017 12:18:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E87E227E63 for ; Tue, 25 Jul 2017 12:18:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD42427F2B; Tue, 25 Jul 2017 12:18:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A1E7127E63 for ; Tue, 25 Jul 2017 12:18:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dZylP-0004sg-Bs; Tue, 25 Jul 2017 12:16:35 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dZylN-0004qE-Ub for xen-devel@lists.xenproject.org; Tue, 25 Jul 2017 12:16:34 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id FA/5D-09901-1A637795; Tue, 25 Jul 2017 12:16:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrohUneBWXm kwZZZphbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aNefcZC+5yVuy9t4O9gbGNvYuRk0NCwF/i 7rRGMJtNwEBixfSrjF2MHBwiAioSt/cagISZBSIkXtxYxQZiCwukSLy/NpMRxGYRUJWYfec7W DmvgL3EtTsJEBPlJSb2TgMr4QQK/9x/HWy6kICdxOadG6BsNYkbC5exgNi8AoISJ2c+YYFYJS Fx8MUL5gmMvLOQpGYhSS1gZFrFqFGcWlSWWqRraKaXVJSZnlGSm5iZo2toYKaXm1pcnJiempO YVKyXnJ+7iREYOAxAsIPx/saAQ4ySHExKorzfdMsjhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw JpkC5QSLUtNTK9Iyc4AhDJOW4OBREuE9ZwKU5i0uSMwtzkyHSJ1i1OV4NeH/NyYhlrz8vFQpc V4BkBkCIEUZpXlwI2DxdIlRVkqYlxHoKCGegtSi3MwSVPlXjOIcjErCvD4gU3gy80rgNr0COo IJ6Ig5M0pBjihJREhJNTCeUjzx4+MBcxFL+960LdnWonvtFPi8C99/s43ZFKUwc4131s+Aqrs 9++W3nas0MfMX2rx+fu2JAyWT2fRiVXcfDZhWWrfmWdzXl3ctTpl/blFyPrzbfpHc015r/xe/ RYx9flgtEno0cfenstDtGzb/65l1ZiNXxcbYP31z77ReSusPeREu9UlKiaU4I9FQi7moOBEAx O6HHaICAAA= X-Env-Sender: prvs=372f2a2d8=anthony.perard@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1500984980!74878558!6 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28342 invoked from network); 25 Jul 2017 12:16:32 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 25 Jul 2017 12:16:32 -0000 X-IronPort-AV: E=Sophos;i="5.40,411,1496102400"; d="scan'208";a="432847723" From: Anthony PERARD To: Date: Tue, 25 Jul 2017 12:57:47 +0100 Message-ID: <20170725115759.21895-13-anthony.perard@citrix.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725115759.21895-1-anthony.perard@citrix.com> References: <20170725115759.21895-1-anthony.perard@citrix.com> MIME-Version: 1.0 Cc: Anthony PERARD , Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH v13 12/24] ts-openstack-deploy: Ignore libvirt-python version and use latest X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Devstack is going to try to install a specific version of libvirt-python (currently 2.5.0) but this fail with libvirt installed by osstest. Remove the requirement and use the latest available instead. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- ts-openstack-deploy | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ts-openstack-deploy b/ts-openstack-deploy index befe3d3..00f262f 100755 --- a/ts-openstack-deploy +++ b/ts-openstack-deploy @@ -93,6 +93,21 @@ END } ); + target_editfile($ho, + "$builddir/requirements/upper-constraints.txt", + sub { + while () { + # Ignore libvirt-python requirement and install latest, + # otherwise it's not going to work with latest libvirt + # installed by osstest. + if (m/^libvirt-python===.*$/) { + next; + } + print EO or die $!; + } + } + ); + # Package python-systemd does not exist in Debian installed by osstest target_editfile($ho, "$builddir/devstack/files/debs/general", sub { while () {