From nobody Sun May 5 11:32:50 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522941858852467.9519499642072; Thu, 5 Apr 2018 08:24:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 62AEEC04AC5D; Thu, 5 Apr 2018 15:24:16 +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 37CB45D6A3; Thu, 5 Apr 2018 15:24:16 +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 015D64CA9E; Thu, 5 Apr 2018 15:24:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35FO5JB002768 for ; Thu, 5 Apr 2018 11:24:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id C65B42024CA5; Thu, 5 Apr 2018 15:24:05 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6DB872024CA2 for ; Thu, 5 Apr 2018 15:24:05 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 17:23:59 +0200 Message-Id: <20180405152400.23724-2-abologna@redhat.com> In-Reply-To: <20180405152400.23724-1-abologna@redhat.com> References: <20180405152400.23724-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/2] jobs: Don't set $PYTHONPATH for python-distutil 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 05 Apr 2018 15:24:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that $PYTHONPATH is set in the environment through the shell profile, we no longer need to set it at the Jenkins level for the virt-manager build to succeed. This reverts commit 6116509ac308562f69d533651d40599a7ce36b39. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- jobs/python-distutils.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 16eca1c..8ef0b27 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -42,7 +42,6 @@ - shell: | {global_env} {local_env} - export PYTHONPATH=3D$VIRT_PREFIX/lib/python{pyver}.4/site-packag= es:$VIRT_PREFIX/lib64/python{pyver}.4/site-packages:$VIRT_PREFIX/lib/python= {pyver}.5/site-packages:$VIRT_PREFIX/lib64/python{pyver}.5/site-packages:$V= IRT_PREFIX/lib/python{pyver}.6/site-packages:$VIRT_PREFIX/lib64/python{pyve= r}.6/site-packages:$VIRT_PREFIX/lib/python{pyver}.7/site-packages:$VIRT_PRE= FIX/lib64/python{pyver}.7/site-packages {command_pre_build} python{pyver} ./setup.py build python{pyver} ./setup.py install --prefix=3D$VIRT_PREFIX @@ -84,7 +83,6 @@ - shell: | {global_env} {local_env} - export PYTHONPATH=3D$VIRT_PREFIX/lib/python{pyver}.4/site-packag= es:$VIRT_PREFIX/lib64/python{pyver}.4/site-packages:$VIRT_PREFIX/lib/python= {pyver}.5/site-packages:$VIRT_PREFIX/lib64/python{pyver}.5/site-packages:$V= IRT_PREFIX/lib/python{pyver}.6/site-packages:$VIRT_PREFIX/lib64/python{pyve= r}.6/site-packages:$VIRT_PREFIX/lib/python{pyver}.7/site-packages:$VIRT_PRE= FIX/lib64/python{pyver}.7/site-packages python{pyver} ./setup.py test publishers: - email: @@ -123,7 +121,6 @@ - shell: | {global_env} {local_env} - export PYTHONPATH=3D$VIRT_PREFIX/lib/python{pyver}.4/site-packag= es:$VIRT_PREFIX/lib64/python{pyver}.4/site-packages:$VIRT_PREFIX/lib/python= {pyver}.5/site-packages:$VIRT_PREFIX/lib64/python{pyver}.5/site-packages:$V= IRT_PREFIX/lib/python{pyver}.6/site-packages:$VIRT_PREFIX/lib64/python{pyve= r}.6/site-packages:$VIRT_PREFIX/lib/python{pyver}.7/site-packages:$VIRT_PRE= FIX/lib64/python{pyver}.7/site-packages sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in python{pyver} ./setup.py rpm publishers: --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 11:32:50 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522941861909146.24912313428752; Thu, 5 Apr 2018 08:24:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C35FB883B1; Thu, 5 Apr 2018 15:24:19 +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 94E0270585; Thu, 5 Apr 2018 15:24:19 +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 5B5A71806103; Thu, 5 Apr 2018 15:24:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35FO6YY002785 for ; Thu, 5 Apr 2018 11:24:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 657532026980; Thu, 5 Apr 2018 15:24:06 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BCF72024CA2 for ; Thu, 5 Apr 2018 15:24:05 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 17:24:00 +0200 Message-Id: <20180405152400.23724-3-abologna@redhat.com> In-Reply-To: <20180405152400.23724-1-abologna@redhat.com> References: <20180405152400.23724-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 2/2] jobs: Build using $PYTHON 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 05 Apr 2018 15:24:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The current setup is fairly complicated and doesn't buy us much in terms of coverage: we can default to Python 3 wherever it's available, and still test Python 2 builds pass thanks to CentOS, which doesn't have Python 3 yet, and the RPM build jobs, which build both variants if at all possible. This reverts commit 57980d405d631f4ce2bfffcec343e506fde343f9 and then some. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- jobs/python-distutils.yaml | 26 +++++++++++++------------- projects/libvirt-python.yaml | 29 ++--------------------------- projects/virt-manager.yaml | 11 ++++------- 3 files changed, 19 insertions(+), 47 deletions(-) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 8ef0b27..bfa0715 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}-py{pyver}-build' + name: '{name}-{branch}-build' project-type: matrix - description: '{title} Build (Python {pyver})' + description: '{title} Build' command_pre_build: '' - workspace: '{name}-{branch}-py{pyver}' + workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true block-upstream: true @@ -43,8 +43,8 @@ {global_env} {local_env} {command_pre_build} - python{pyver} ./setup.py build - python{pyver} ./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,10 +54,10 @@ =20 - job-template: id: python-distutils-check-job - name: '{name}-{branch}-py{pyver}-check' + name: '{name}-{branch}-check' project-type: matrix - description: '{title} Check (Python {pyver})' - workspace: '{name}-{branch}-py{pyver}' + description: '{title} Check' + workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true block-upstream: true @@ -83,7 +83,7 @@ - shell: | {global_env} {local_env} - python{pyver} ./setup.py test + $PYTHON ./setup.py test publishers: - email: recipients: '{obj:spam}' @@ -92,10 +92,10 @@ =20 - job-template: id: python-distutils-rpm-job - name: '{name}-{branch}-py{pyver}-rpm' + name: '{name}-{branch}-rpm' project-type: matrix - description: '{title} RPM (Python {pyver})' - workspace: '{name}-{branch}-py{pyver}' + description: '{title} RPM' + workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true block-upstream: true @@ -122,7 +122,7 @@ {global_env} {local_env} sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - python{pyver} ./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 1c29321..dd8ac13 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -14,36 +14,11 @@ title: Libvirt Python jobs: - python-distutils-build-job: - pyver: 2 parent_jobs: 'libvirt-master-build' - - python-distutils-build-job: - pyver: 3 - 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: - pyver: 2 - parent_jobs: 'libvirt-python-master-py{pyver}-build' - - python-distutils-check-job: - pyver: 3 - parent_jobs: 'libvirt-python-master-py{pyver}-build' - machines: - - libvirt-debian-8 - - libvirt-debian-9 - - libvirt-fedora-26 - - libvirt-fedora-27 - - libvirt-fedora-rawhide - - libvirt-freebsd-10 - - libvirt-freebsd-11 + parent_jobs: 'libvirt-python-master-build' - python-distutils-rpm-job: - pyver: 2 - parent_jobs: 'libvirt-python-master-py{pyver}-check' + parent_jobs: 'libvirt-python-master-check' machines: - libvirt-centos-6 - libvirt-centos-7 diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index e626cb0..8c18680 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -11,15 +11,13 @@ title: Virtual Machine Manager jobs: - python-distutils-build-job: - pyver: 3 parent_jobs: - - 'libvirt-python-master-py{pyver}-build' + - 'libvirt-python-master-build' - 'libosinfo-master-build' command_pre_build: | - python{pyver} ./setup.py configure --prefix=3D$VIRT_PREFIX + $PYTHON ./setup.py configure --prefix=3D$VIRT_PREFIX - python-distutils-check-job: - pyver: 3 - parent_jobs: 'virt-manager-master-py{pyver}-build' + parent_jobs: 'virt-manager-master-build' # libxml2's Python 3 bindings don't work properly on FreeBSD, # so skip the test suite there for the time being. See # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D224902 @@ -29,8 +27,7 @@ - libvirt-fedora-27 - libvirt-fedora-rawhide - python-distutils-rpm-job: - pyver: 3 - parent_jobs: 'virt-manager-master-py{pyver}-check' + parent_jobs: 'virt-manager-master-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