From nobody Fri May 3 21:14:46 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 1518095356554454.09619018349247; Thu, 8 Feb 2018 05:09:16 -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 13606C0568E0; Thu, 8 Feb 2018 13:09:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E05C2798CA; Thu, 8 Feb 2018 13:09:14 +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 A860A4A46C; Thu, 8 Feb 2018 13:09:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w18D7XJt003523 for ; Thu, 8 Feb 2018 08:07:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id CF17310073B8; Thu, 8 Feb 2018 13:07:33 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C6DC10073B7 for ; Thu, 8 Feb 2018 13:07:33 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 8 Feb 2018 14:07:23 +0100 Message-Id: <20180208130726.9084-2-abologna@redhat.com> In-Reply-To: <20180208130726.9084-1-abologna@redhat.com> References: <20180208130726.9084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH v2 1/4] jobs: Make Python version configurable 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.32]); Thu, 08 Feb 2018 13:09:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Some projects, namely libvirt-python, support Python 2 and Python 3, so we'd like to have CI coverage of both; other projects, namely virt-manager, no longer support Python 2 so we need to start building them using Python 3 instead. After this change, the names of jobs as well as workspaces include the Python version so that they can happily live side by side. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrange --- jobs/python-distutils.yaml | 22 +++++++++++----------- projects/libvirt-python.yaml | 7 +++++-- projects/virt-manager.yaml | 11 +++++++---- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 47b25f1..122c759 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -1,11 +1,11 @@ =20 - job-template: id: python-distutils-build-job - name: '{name}-{branch}-build' + name: '{name}-{branch}-{python}-build' project-type: matrix - description: '{title} Build' + description: '{title} Build ({python})' command_pre_build: '' - workspace: '{name}-{branch}' + workspace: '{name}-{branch}-{python}' child-workspace: '.' block-downstream: true block-upstream: true @@ -43,8 +43,8 @@ {global_env} {local_env} {command_pre_build} - python2 setup.py build - python2 setup.py install --prefix=3D$VIRT_PREFIX + {python} ./setup.py build + {python} ./setup.py install --prefix=3D$VIRT_PREFIX publishers: - email: recipients: '{obj:spam}' @@ -54,9 +54,9 @@ =20 - job-template: id: python-distutils-check-job - name: '{name}-{branch}-check' + name: '{name}-{branch}-{python}-check' project-type: matrix - description: '{title} Check' + description: '{title} Check ({python})' workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true @@ -83,7 +83,7 @@ - shell: | {global_env} {local_env} - python2 setup.py test + {python} ./setup.py test publishers: - email: recipients: '{obj:spam}' @@ -92,9 +92,9 @@ =20 - job-template: id: python-distutils-rpm-job - name: '{name}-{branch}-rpm' + name: '{name}-{branch}-{python}-rpm' project-type: matrix - description: '{title} RPM' + description: '{title} RPM ({python})' workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true @@ -122,7 +122,7 @@ {global_env} {local_env} sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - python2 setup.py rpm + {python} ./setup.py rpm publishers: - email: recipients: '{obj:spam}' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index dd8ac13..540238d 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -14,11 +14,14 @@ title: Libvirt Python jobs: - python-distutils-build-job: + python: python2 parent_jobs: 'libvirt-master-build' - python-distutils-check-job: - parent_jobs: 'libvirt-python-master-build' + python: python2 + parent_jobs: 'libvirt-python-master-{python}-build' - python-distutils-rpm-job: - parent_jobs: 'libvirt-python-master-check' + python: python2 + parent_jobs: 'libvirt-python-master-{python}-check' machines: - libvirt-centos-6 - libvirt-centos-7 diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index c1d198b..2d13c15 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -13,15 +13,18 @@ title: Virtual Machine Manager jobs: - python-distutils-build-job: + python: python2 parent_jobs: - - 'libvirt-python-master-build' + - 'libvirt-python-master-{python}-build' - 'libosinfo-master-build' command_pre_build: | - python2 setup.py configure --prefix=3D$VIRT_PREFIX + {python} ./setup.py configure --prefix=3D$VIRT_PREFIX - python-distutils-check-job: - parent_jobs: 'virt-manager-master-build' + python: python2 + parent_jobs: 'virt-manager-master-{python}-build' - python-distutils-rpm-job: - parent_jobs: 'virt-manager-master-check' + python: python2 + parent_jobs: 'virt-manager-master-{python}-check' machines: - libvirt-centos-7 - libvirt-fedora-26 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 21:14:46 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 1518095346830102.89741549457483; Thu, 8 Feb 2018 05:09:06 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4185285A05; Thu, 8 Feb 2018 13:09:05 +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 1495A869FC; Thu, 8 Feb 2018 13:09:05 +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 6684718033DD; Thu, 8 Feb 2018 13:09:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w18D7YNJ003528 for ; Thu, 8 Feb 2018 08:07:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id 69C6310073B7; Thu, 8 Feb 2018 13:07:34 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1322710073BB for ; Thu, 8 Feb 2018 13:07:33 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 8 Feb 2018 14:07:24 +0100 Message-Id: <20180208130726.9084-3-abologna@redhat.com> In-Reply-To: <20180208130726.9084-1-abologna@redhat.com> References: <20180208130726.9084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH v2 2/4] projects: Build libvirt-python for Python 3 too 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 08 Feb 2018 13:09:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We don't need a second RPM job, because the existing one already builds both Python 2 and Python 3 RPMs if the OS supports it. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrange --- projects/libvirt-python.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index 540238d..e065c5d 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -16,9 +16,31 @@ - python-distutils-build-job: python: python2 parent_jobs: 'libvirt-master-build' + - python-distutils-build-job: + python: python3 + parent_jobs: 'libvirt-master-build' + machines: + - libvirt-debian-8 + - libvirt-debian-9 + - libvirt-fedora-26 + - libvirt-fedora-27 + - libvirt-fedora-rawhide + - libvirt-freebsd-10 + - libvirt-freebsd-11 - python-distutils-check-job: python: python2 parent_jobs: 'libvirt-python-master-{python}-build' + - python-distutils-check-job: + python: python3 + parent_jobs: 'libvirt-python-master-{python}-build' + machines: + - libvirt-debian-8 + - libvirt-debian-9 + - libvirt-fedora-26 + - libvirt-fedora-27 + - libvirt-fedora-rawhide + - libvirt-freebsd-10 + - libvirt-freebsd-11 - python-distutils-rpm-job: python: python2 parent_jobs: 'libvirt-python-master-{python}-check' --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 21:14:46 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 1518095359793779.0234193781936; Thu, 8 Feb 2018 05:09:19 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17FF02CE965; Thu, 8 Feb 2018 13:09:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E416C80F77; Thu, 8 Feb 2018 13:09:17 +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 A62074A46F; Thu, 8 Feb 2018 13:09:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w18D7Ztb003534 for ; Thu, 8 Feb 2018 08:07:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0508610073B7; Thu, 8 Feb 2018 13:07:35 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A1DB410073B8 for ; Thu, 8 Feb 2018 13:07:34 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 8 Feb 2018 14:07:25 +0100 Message-Id: <20180208130726.9084-4-abologna@redhat.com> In-Reply-To: <20180208130726.9084-1-abologna@redhat.com> References: <20180208130726.9084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH v2 3/4] projects: Build virt-manager using 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 08 Feb 2018 13:09:18 +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 wa can no longer build it using Python 2. That means installing the Python 3 version of all its dependencies and no longer building on OSs that don't ship Python 3, such as CentOS. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrange --- 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 +++--- projects/virt-manager.yaml | 9 +++---- 7 files changed, 29 insertions(+), 33 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 diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 2d13c15..b5b0df5 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -2,8 +2,6 @@ - project: name: virt-manager machines: - - libvirt-centos-7 - - libvirt-debian-8 - libvirt-debian-9 - libvirt-fedora-26 - libvirt-fedora-27 @@ -13,20 +11,19 @@ title: Virtual Machine Manager jobs: - python-distutils-build-job: - python: python2 + python: python3 parent_jobs: - 'libvirt-python-master-{python}-build' - 'libosinfo-master-build' command_pre_build: | {python} ./setup.py configure --prefix=3D$VIRT_PREFIX - python-distutils-check-job: - python: python2 + python: python3 parent_jobs: 'virt-manager-master-{python}-build' - python-distutils-rpm-job: - python: python2 + python: python3 parent_jobs: 'virt-manager-master-{python}-check' machines: - - libvirt-centos-7 - libvirt-fedora-26 - libvirt-fedora-27 - libvirt-fedora-rawhide --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 21:14:46 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 1518095356577439.1664101953353; Thu, 8 Feb 2018 05:09:16 -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 DEAA95D678; Thu, 8 Feb 2018 13:09:14 +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 B5D9B798C9; Thu, 8 Feb 2018 13:09:14 +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 8144718033E6; Thu, 8 Feb 2018 13:09:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w18D7Zdg003542 for ; Thu, 8 Feb 2018 08:07:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 940D610073B7; Thu, 8 Feb 2018 13:07:35 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D2DE10073B8 for ; Thu, 8 Feb 2018 13:07:35 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 8 Feb 2018 14:07:26 +0100 Message-Id: <20180208130726.9084-5-abologna@redhat.com> In-Reply-To: <20180208130726.9084-1-abologna@redhat.com> References: <20180208130726.9084-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH v2 4/4] guests: Fix Python installation 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.39]); Thu, 08 Feb 2018 13:09:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Clean up the mappings to make sure we install the python2 and python3 packages on FreeBSD instead of python27 and python36, because the former are the ones that contain the respective command - which build jobs will invoke. Make the dependency on the above explicit for the libvirt-python jobs. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrange --- guests/vars/mappings.yml | 9 +++++++-- guests/vars/projects/libvirt-python.yml | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 579deb4..e3781b9 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -550,9 +550,14 @@ mappings: pkg: polkit rpm: polkit-devel =20 + python2: + default: python + Fedora: python2 + FreeBSD: python2 + python2-devel: deb: python-dev - pkg: python27 + pkg: python2 rpm: python2-devel =20 python2-lxml: @@ -571,7 +576,7 @@ mappings: =20 python3-devel: deb: python3-dev - pkg: python36 + pkg: python3 Fedora: python3-devel =20 python3-gi: diff --git a/guests/vars/projects/libvirt-python.yml b/guests/vars/projects= /libvirt-python.yml index 72dcb4a..774da26 100644 --- a/guests/vars/projects/libvirt-python.yml +++ b/guests/vars/projects/libvirt-python.yml @@ -1,8 +1,10 @@ --- packages: + - python2 - python2-devel - python2-lxml - python2-nose + - python3 - python3-devel - python3-lxml - python3-nose --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list