From nobody Sat May 4 19:00:39 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 1518608836893431.88489385350977; Wed, 14 Feb 2018 03:47:16 -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 3970A81127; Wed, 14 Feb 2018 11:47:14 +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 79E005C1AB; Wed, 14 Feb 2018 11:47:13 +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 D48076B543; Wed, 14 Feb 2018 11:47:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1EBl8Fb003897 for ; Wed, 14 Feb 2018 06:47:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id BB1012156A3F; Wed, 14 Feb 2018 11:47:08 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 61929217B409 for ; Wed, 14 Feb 2018 11:47:08 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 14 Feb 2018 12:47:04 +0100 Message-Id: <20180214114704.27352-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] jobs: Shorten name for python-distutils jobs 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.27]); Wed, 14 Feb 2018 11:47:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of passing the full name of the Python binary as 'python', only pass the major version as 'pyver' and build everything else based on that. Doing so allows us to make a few things, most notably job names, slightly shorter and nicer. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- I wouldn't bother changing this if the previous change to Python jobs had already been deployed, but since it hasn't yet might as well have nicer names instead :) jobs/python-distutils.yaml | 22 +++++++++++----------- projects/libvirt-python.yaml | 16 ++++++++-------- projects/virt-manager.yaml | 14 +++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 122c759..ff68c29 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}-{python}-build' + name: '{name}-{branch}-py{pyver}-build' project-type: matrix - description: '{title} Build ({python})' + description: '{title} Build (Python {pyver})' command_pre_build: '' - workspace: '{name}-{branch}-{python}' + workspace: '{name}-{branch}-py{pyver}' child-workspace: '.' block-downstream: true block-upstream: true @@ -43,8 +43,8 @@ {global_env} {local_env} {command_pre_build} - {python} ./setup.py build - {python} ./setup.py install --prefix=3D$VIRT_PREFIX + python{pyver} ./setup.py build + python{pyver} ./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}-{python}-check' + name: '{name}-{branch}-py{pyver}-check' project-type: matrix - description: '{title} Check ({python})' + description: '{title} Check (Python {pyver})' workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true @@ -83,7 +83,7 @@ - shell: | {global_env} {local_env} - {python} ./setup.py test + python{pyver} ./setup.py test publishers: - email: recipients: '{obj:spam}' @@ -92,9 +92,9 @@ =20 - job-template: id: python-distutils-rpm-job - name: '{name}-{branch}-{python}-rpm' + name: '{name}-{branch}-py{pyver}-rpm' project-type: matrix - description: '{title} RPM ({python})' + description: '{title} RPM (Python {pyver})' 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 - {python} ./setup.py rpm + python{pyver} ./setup.py rpm publishers: - email: recipients: '{obj:spam}' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index e065c5d..1c29321 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -14,10 +14,10 @@ title: Libvirt Python jobs: - python-distutils-build-job: - python: python2 + pyver: 2 parent_jobs: 'libvirt-master-build' - python-distutils-build-job: - python: python3 + pyver: 3 parent_jobs: 'libvirt-master-build' machines: - libvirt-debian-8 @@ -28,11 +28,11 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 - python-distutils-check-job: - python: python2 - parent_jobs: 'libvirt-python-master-{python}-build' + pyver: 2 + parent_jobs: 'libvirt-python-master-py{pyver}-build' - python-distutils-check-job: - python: python3 - parent_jobs: 'libvirt-python-master-{python}-build' + pyver: 3 + parent_jobs: 'libvirt-python-master-py{pyver}-build' machines: - libvirt-debian-8 - libvirt-debian-9 @@ -42,8 +42,8 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 - python-distutils-rpm-job: - python: python2 - parent_jobs: 'libvirt-python-master-{python}-check' + pyver: 2 + parent_jobs: 'libvirt-python-master-py{pyver}-check' machines: - libvirt-centos-6 - libvirt-centos-7 diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index b5b0df5..8f3112e 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -11,18 +11,18 @@ title: Virtual Machine Manager jobs: - python-distutils-build-job: - python: python3 + pyver: 3 parent_jobs: - - 'libvirt-python-master-{python}-build' + - 'libvirt-python-master-py{pyver}-build' - 'libosinfo-master-build' command_pre_build: | - {python} ./setup.py configure --prefix=3D$VIRT_PREFIX + python{pyver} ./setup.py configure --prefix=3D$VIRT_PREFIX - python-distutils-check-job: - python: python3 - parent_jobs: 'virt-manager-master-{python}-build' + pyver: 3 + parent_jobs: 'virt-manager-master-py{pyver}-build' - python-distutils-rpm-job: - python: python3 - parent_jobs: 'virt-manager-master-{python}-check' + pyver: 3 + parent_jobs: 'virt-manager-master-py{pyver}-check' machines: - libvirt-fedora-26 - libvirt-fedora-27 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list