From patchwork Fri Jul 28 13:56:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9868947 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 8DE196037D for ; Fri, 28 Jul 2017 14:18:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87D4E286A2 for ; Fri, 28 Jul 2017 14:18:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CB8A287C3; Fri, 28 Jul 2017 14:18:38 +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 3B1BB286A2 for ; Fri, 28 Jul 2017 14:18:38 +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 1db64H-0003xe-4A; Fri, 28 Jul 2017 14:16:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1db64F-0003u5-BS for xen-devel@lists.xenproject.org; Fri, 28 Jul 2017 14:16:39 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 1C/D7-01736-6474B795; Fri, 28 Jul 2017 14:16:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrohUtfNvTr SYP4nLovvWyYzOTB6HP5whSWAMYo1My8pvyKBNePGvPuMBXc5K/be28HewNjG3sXIySEh4C+x YOZuVhCbTcBAYsX0q4xdjBwcIgIqErf3GoCEmQUiJF7cWMUGYgsLpEg0Le0Gs1kEVCU6J61kA innFbCXeLhcH2KivMTE3mmMIDYnUPjvv+9g5UICdhKXfj1mgrDVJG4sXMYCYvMKCEqcnPmEBW KVhMTBFy+YJzDyzkKSmoUktYCRaRWjRnFqUVlqka6hkV5SUWZ6RkluYmaOrqGBqV5uanFxYnp qTmJSsV5yfu4mRmDgMADBDsa+Wc6HGCU5mJREeW+aVUcK8SXlp1RmJBZnxBeV5qQWH2KU4eBQ kuBd5gqUEyxKTU+tSMvMAYYwTFqCg0dJhHc1SJq3uCAxtzgzHSJ1ilGX49WE/9+YhFjy8vNSp cR5PUCKBECKMkrz4EbA4ukSo6yUMC8j0FFCPAWpRbmZJajyrxjFORiVhHlbQKbwZOaVwG16BX QEE9ARE5sqQY4oSURISTUw8j+6YXPzUPz8ml36jQapD9t0zs8+tO2KW8CmOiaF1VeqZJy0Ot5 NUF3KrdD7uVh5wZL+vki9JarfAya2fb4dcOLlfj++lZNmcu75p9Sp77XWOHibJ89PQXcVY0Y1 jbuH7C6+6r+m525Xw3cgb9N5hcKzptOeTvutmzJlsknOkonHc5X5Fn3RUmIpzkg01GIuKk4EA G3tAayiAgAA X-Env-Sender: prvs=3753e7f57=anthony.perard@citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1501251385!101993280!5 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 20773 invoked from network); 28 Jul 2017 14:16:37 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jul 2017 14:16:37 -0000 X-IronPort-AV: E=Sophos;i="5.40,425,1496102400"; d="scan'208";a="433431096" From: Anthony PERARD To: Date: Fri, 28 Jul 2017 14:56:13 +0100 Message-ID: <20170728135625.30263-13-anthony.perard@citrix.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170728135625.30263-1-anthony.perard@citrix.com> References: <20170728135625.30263-1-anthony.perard@citrix.com> MIME-Version: 1.0 Cc: Anthony PERARD , Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH v14 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 () {