From nobody Wed May 14 22:50:17 2025 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 --- 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