From nobody Sun Apr 28 01:18:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1518019733111409.3261498332628; Wed, 7 Feb 2018 08:08:53 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D712F2D1B5; Wed, 7 Feb 2018 16:08:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83BDE17AFD; Wed, 7 Feb 2018 16:08:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7E96D18033DE; Wed, 7 Feb 2018 16:08:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w17G8hJV013316 for ; Wed, 7 Feb 2018 11:08:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 49CFDD1BBE; Wed, 7 Feb 2018 16:08:43 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 737B0D1BBD for ; Wed, 7 Feb 2018 16:08:42 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 7 Feb 2018 17:08:34 +0100 Message-Id: <20180207160835.26907-2-abologna@redhat.com> In-Reply-To: <20180207160835.26907-1-abologna@redhat.com> References: <20180207160835.26907-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/2] guests: Install Python 3 dependencies for virt-manager X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 07 Feb 2018 16:08:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virt-manager is Python 3 only now, so we need to update the list of packages that gets installed on our guests. In some cases the Python 3 build of the dependency is not available, so we have no choice but to stop building virt-manager there. Signed-off-by: Andrea Bolognani --- guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-8/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/vars/mappings.yml | 41 ++++++++++++++++---------= ---- guests/vars/projects/virt-manager.yml | 8 +++--- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/= libvirt-centos-7/main.yml index 30c826a..8338f99 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -13,5 +13,4 @@ projects: - libvirt-sandbox - osinfo-db - osinfo-db-tools - - virt-manager - virt-viewer diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/= libvirt-debian-8/main.yml index f097792..ecf9cd3 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -11,5 +11,4 @@ projects: - libvirt-python - libvirt-tck - osinfo-db-tools - - virt-manager - virt-viewer diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars= /libvirt-ubuntu-14/main.yml index 18b013d..c11dd5b 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -7,5 +7,4 @@ projects: - libvirt-python - libvirt-tck - osinfo-db-tools - - virt-manager - virt-viewer diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars= /libvirt-ubuntu-16/main.yml index 7baecf7..190f174 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -11,5 +11,4 @@ projects: - libvirt-sandbox - libvirt-tck - osinfo-db-tools - - virt-manager - virt-viewer diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 440123c..579deb4 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -555,21 +555,6 @@ mappings: pkg: python27 rpm: python2-devel =20 - python2-gi: - deb: python-gi - pkg: py27-gobject3 - rpm: python-gobject - CentOS6: - - python2-ipaddr: - default: python-ipaddr - FreeBSD: py27-ipaddr - - python2-libxml2: - default: python-libxml2 - pkg: py27-libxml2 - CentOS: libxml2-python - python2-lxml: default: python-lxml Fedora: python2-lxml @@ -580,16 +565,28 @@ mappings: Fedora: python2-nose FreeBSD: py27-nose =20 - python2-requests: - default: python-requests - Fedora: python2-requests - FreeBSD: py27-requests + python3: + default: python3 + CentOS: =20 python3-devel: deb: python3-dev pkg: python36 Fedora: python3-devel =20 + python3-gi: + deb: python3-gi + pkg: py36-gobject3 + rpm: python3-gobject + CentOS: + + python3-libxml2: + default: python3-libxml2 + FreeBSD: py36-libxml2 + CentOS: + Ubuntu: + Debian8: + python3-lxml: default: python3-lxml FreeBSD: py36-lxml @@ -600,6 +597,12 @@ mappings: FreeBSD: py36-nose CentOS: =20 + python3-requests: + default: python3-requests + FreeBSD: py36-requests + CentOS: + Ubuntu12: + qemu-img: default: qemu-utils rpm: qemu-img diff --git a/guests/vars/projects/virt-manager.yml b/guests/vars/projects/v= irt-manager.yml index 474017f..e9e5324 100644 --- a/guests/vars/projects/virt-manager.yml +++ b/guests/vars/projects/virt-manager.yml @@ -1,8 +1,8 @@ --- packages: - intltool - - python2-gi - - python2-ipaddr - - python2-libxml2 - - python2-requests + - python3 + - python3-gi + - python3-libxml2 + - python3-requests - unzip --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 01:18:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1518019728464518.493120277506; Wed, 7 Feb 2018 08:08:48 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 513B890C9E; Wed, 7 Feb 2018 16:08:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08F2A5C885; Wed, 7 Feb 2018 16:08:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E23F518033E1; Wed, 7 Feb 2018 16:08:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w17G8iHf013326 for ; Wed, 7 Feb 2018 11:08:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 54E22D1BBD; Wed, 7 Feb 2018 16:08:44 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE1A0AE7A0 for ; Wed, 7 Feb 2018 16:08:43 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 7 Feb 2018 17:08:35 +0100 Message-Id: <20180207160835.26907-3-abologna@redhat.com> In-Reply-To: <20180207160835.26907-1-abologna@redhat.com> References: <20180207160835.26907-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 2/2] jobs: Switch all Python builds to Python 3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 07 Feb 2018 16:08:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virt-manager is Python 3 only now, so using Python 2 to call its build script will not work. Moreover, since we build and test it against our local copy of libvirt-python, we need to make sure libvirt-python itself is built for Python 3. At the moment, we don't have support for building against several Python versions, so our only option is to switch from Python 2 to Python 3 entirely. We don't lose all build coverage for the Python 2 bits thanks to the fact that the libvirt-python-master-rpm job will still build both python2-libvirt and python3-libvirt, but we definitely want to come up with a better solution in the long run. Signed-off-by: Andrea Bolognani --- guests/host_vars/libvirt-centos-6/main.yml | 1 - guests/host_vars/libvirt-centos-7/main.yml | 1 - jobs/python-distutils.yaml | 8 ++++---- projects/virt-manager.yaml | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/= libvirt-centos-6/main.yml index d717ae7..c3651f3 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -5,4 +5,3 @@ projects: - libvirt - libvirt-cim - libvirt-perl - - libvirt-python diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/= libvirt-centos-7/main.yml index 8338f99..15812ae 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -9,7 +9,6 @@ projects: - libvirt-go - libvirt-go-xml - libvirt-perl - - libvirt-python - libvirt-sandbox - osinfo-db - osinfo-db-tools diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 47b25f1..a6fd107 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -43,8 +43,8 @@ {global_env} {local_env} {command_pre_build} - python2 setup.py build - python2 setup.py install --prefix=3D$VIRT_PREFIX + python3 setup.py build + python3 setup.py install --prefix=3D$VIRT_PREFIX publishers: - email: recipients: '{obj:spam}' @@ -83,7 +83,7 @@ - shell: | {global_env} {local_env} - python2 setup.py test + python3 setup.py test publishers: - email: recipients: '{obj:spam}' @@ -122,7 +122,7 @@ {global_env} {local_env} sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - python2 setup.py rpm + python3 setup.py rpm publishers: - email: recipients: '{obj:spam}' diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index c1d198b..6a99a91 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -17,7 +17,7 @@ - 'libvirt-python-master-build' - 'libosinfo-master-build' command_pre_build: | - python2 setup.py configure --prefix=3D$VIRT_PREFIX + python3 setup.py configure --prefix=3D$VIRT_PREFIX - python-distutils-check-job: parent_jobs: 'virt-manager-master-build' - python-distutils-rpm-job: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list