From nobody Thu Apr 25 06:57:48 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 1533908274995487.77095640199605; Fri, 10 Aug 2018 06:37:54 -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 DDAB8308FBAB; Fri, 10 Aug 2018 13:37:52 +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 9BAC051C68; Fri, 10 Aug 2018 13:37:52 +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 3DFC91841C4A; Fri, 10 Aug 2018 13:37:52 +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 w7ADboH7007031 for ; Fri, 10 Aug 2018 09:37:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id CADEB2026D68; Fri, 10 Aug 2018 13:37:50 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CAD02026D65 for ; Fri, 10 Aug 2018 13:37:50 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 Aug 2018 15:37:41 +0200 Message-Id: <20180810133745.15911-2-abologna@redhat.com> In-Reply-To: <20180810133745.15911-1-abologna@redhat.com> References: <20180810133745.15911-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/5] jobs: Call rpmbuild explicitly for Python projects 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.43]); Fri, 10 Aug 2018 13:37:53 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of using the custom 'rpm' target of setup.py, generate a dist archive using the 'sdist' target and then call rpmbuild ourselves: this way we can define _topdir and stop artifacts from ending up in ~/rpmbuild. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- jobs/python-distutils.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 0b20b17..5601d26 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -122,7 +122,9 @@ {global_env} {local_env} sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - $PYTHON ./setup.py rpm + rm -f dist/*.tar.{{ archive_format }} + $PYTHON ./setup.py sdist + rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta dist/*.ta= r.{{ archive_format }} publishers: - email: recipients: '{obj:spam}' --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 06:57:48 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 1533908285371145.29910142114204; Fri, 10 Aug 2018 06:38:05 -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 0B7EF30B96F3; Fri, 10 Aug 2018 13:38:02 +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 A86F9176BD; Fri, 10 Aug 2018 13:38:01 +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 3F4164A46C; Fri, 10 Aug 2018 13:38:01 +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 w7ADbpob007041 for ; Fri, 10 Aug 2018 09:37:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 939822026D68; Fri, 10 Aug 2018 13:37:51 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 23F802026D65 for ; Fri, 10 Aug 2018 13:37:50 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 Aug 2018 15:37:42 +0200 Message-Id: <20180810133745.15911-3-abologna@redhat.com> In-Reply-To: <20180810133745.15911-1-abologna@redhat.com> References: <20180810133745.15911-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/5] jobs: Call rpmbuild and sed consistently 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.49]); Fri, 10 Aug 2018 13:38:03 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Doing so will allow us to refactor away the common parts. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- jobs/autotools.yaml | 8 ++++---- jobs/perl-modulebuild.yaml | 6 +++--- jobs/python-distutils.yaml | 2 +- projects/osinfo-db.yaml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index f1ebf7b..ebf5bd8 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -167,12 +167,12 @@ {global_env} {local_env} cd build - sed -i -e 's/BuildRequires: osinfo-db.*//' {name}.spec - sed -i -e 's/BuildRequires: libvirt.*devel.*//' {name}.spec - sed -i -e 's/BuildRequires: pkgconfig(libvirt.*).*//' {name}.spec + sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec* + sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* + sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec* rm -f *.tar.{archive_format} $MAKE dist - rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta {name}-*.= tar.{archive_format} + rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta *.tar.{ar= chive_format} publishers: - email: recipients: '{obj:spam}' diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 3f3f537..93f7054 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -121,9 +121,9 @@ - shell: | {global_env} {local_env} - sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec - sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec - sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec + sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec* + sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec* + sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* rm -f *.tar.{archive_format} perl Build dist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta *.tar.{ar= chive_format} diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 5601d26..2cdf25b 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -121,7 +121,7 @@ - shell: | {global_env} {local_env} - sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in + sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* rm -f dist/*.tar.{{ archive_format }} $PYTHON ./setup.py sdist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta dist/*.ta= r.{{ archive_format }} diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index d154c98..b8b609e 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -19,5 +19,5 @@ parent_jobs: 'osinfo-db-master-check' machines: '{rpm_machines}' command: | - perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db= .spec + sed -i -e 's/BuildRequires: *osinfo-db-tools.*//' *.spec* rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_= sourcedir `pwd`" -ba osinfo-db.spec --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 06:57:48 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 15339082785371000.8344440437481; Fri, 10 Aug 2018 06:37:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8D52E30E6850; Fri, 10 Aug 2018 13:37:56 +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 5551D9CE0E; Fri, 10 Aug 2018 13:37:56 +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 DE0E11841C57; Fri, 10 Aug 2018 13:37:55 +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 w7ADbq5m007046 for ; Fri, 10 Aug 2018 09:37:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5702D2026D68; Fri, 10 Aug 2018 13:37:52 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC3662026D65 for ; Fri, 10 Aug 2018 13:37:51 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 Aug 2018 15:37:43 +0200 Message-Id: <20180810133745.15911-4-abologna@redhat.com> In-Reply-To: <20180810133745.15911-1-abologna@redhat.com> References: <20180810133745.15911-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 3/5] jobs: Introduce strip_buildrequires 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.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 10 Aug 2018 13:37:57 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There's no harm in attempting to strip more BuildRequires than are present in a spec file, so define a shell snippet we can reuse for the the purpose without duplicating the same lines all over the place. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- jobs/autotools.yaml | 4 +--- jobs/defaults.yaml | 7 +++++++ jobs/perl-modulebuild.yaml | 4 +--- jobs/python-distutils.yaml | 2 +- projects/osinfo-db.yaml | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index ebf5bd8..f8a7e87 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -167,9 +167,7 @@ {global_env} {local_env} cd build - sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec* - sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* - sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec* + {strip_buildrequires} rm -f *.tar.{archive_format} $MAKE dist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta *.tar.{ar= chive_format} diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index eb04f32..e4d1f2c 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -23,6 +23,13 @@ archive_format: gz global_env: | local_env: | + strip_buildrequires: | + sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* + sed -i -e 's/BuildRequires: *osinfo-db-tools.*//' *.spec* + sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec* + sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec* + sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec* + sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec* mingw32_local_env: | export VIRT_PREFIX=3D"$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw" export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 93f7054..8b30d7e 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -121,9 +121,7 @@ - shell: | {global_env} {local_env} - sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec* - sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec* - sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* + {strip_buildrequires} rm -f *.tar.{archive_format} perl Build dist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta *.tar.{ar= chive_format} diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 2cdf25b..eae5b6f 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -121,7 +121,7 @@ - shell: | {global_env} {local_env} - sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* + {strip_buildrequires} rm -f dist/*.tar.{{ archive_format }} $PYTHON ./setup.py sdist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta dist/*.ta= r.{{ archive_format }} diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index b8b609e..7ee84a3 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -19,5 +19,5 @@ parent_jobs: 'osinfo-db-master-check' machines: '{rpm_machines}' command: | - sed -i -e 's/BuildRequires: *osinfo-db-tools.*//' *.spec* + {strip_buildrequires} rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_= sourcedir `pwd`" -ba osinfo-db.spec --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 06:57:48 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 1533908281696713.4040035900612; Fri, 10 Aug 2018 06:38:01 -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 F0446C0587D2; Fri, 10 Aug 2018 13:37:58 +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 A201D51950; Fri, 10 Aug 2018 13:37:58 +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 43F804A46C; Fri, 10 Aug 2018 13:37:58 +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 w7ADbrVo007054 for ; Fri, 10 Aug 2018 09:37:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1A6AC2026D68; Fri, 10 Aug 2018 13:37:53 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FF042026D65 for ; Fri, 10 Aug 2018 13:37:52 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 Aug 2018 15:37:44 +0200 Message-Id: <20180810133745.15911-5-abologna@redhat.com> In-Reply-To: <20180810133745.15911-1-abologna@redhat.com> References: <20180810133745.15911-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 4/5] jobs: Minimize strip_buildrequires 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.32]); Fri, 10 Aug 2018 13:37:59 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We can drop some entries and tweak some others to be less verbose without losing in functionality. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- jobs/defaults.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml index e4d1f2c..bab5bc4 100644 --- a/jobs/defaults.yaml +++ b/jobs/defaults.yaml @@ -24,11 +24,9 @@ global_env: | local_env: | strip_buildrequires: | - sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec* - sed -i -e 's/BuildRequires: *osinfo-db-tools.*//' *.spec* + sed -i -e 's/BuildRequires: *libvirt.*//' *.spec* sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec* sed -i -e 's/BuildRequires: *perl(Sys::Virt).*//' *.spec* - sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec* sed -i -e 's/BuildRequires: *pkgconfig(libvirt.*).*//' *.spec* mingw32_local_env: | export VIRT_PREFIX=3D"$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw" --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 06:57:48 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 1533908286784965.8715233701162; Fri, 10 Aug 2018 06:38:06 -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 519DECF29; Fri, 10 Aug 2018 13:38:04 +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 17B5878C07; Fri, 10 Aug 2018 13:38:04 +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 A4F4E1841C66; Fri, 10 Aug 2018 13:38:03 +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 w7ADbrxe007061 for ; Fri, 10 Aug 2018 09:37:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id D3E8B2026D68; Fri, 10 Aug 2018 13:37:53 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 63CEF2026D65 for ; Fri, 10 Aug 2018 13:37:53 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 10 Aug 2018 15:37:45 +0200 Message-Id: <20180810133745.15911-6-abologna@redhat.com> In-Reply-To: <20180810133745.15911-1-abologna@redhat.com> References: <20180810133745.15911-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 5/5] jobs: Don't remove non-existing archives 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.30]); Fri, 10 Aug 2018 13:38:05 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" None of our jobs create the archives as a side-effect, so trying to remove them before generating them is pointless. Signed-off-by: Andrea Bolognani --- jobs/autotools.yaml | 1 - jobs/perl-modulebuild.yaml | 1 - jobs/python-distutils.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index f8a7e87..4e075bd 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -168,7 +168,6 @@ {local_env} cd build {strip_buildrequires} - rm -f *.tar.{archive_format} $MAKE dist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta *.tar.{ar= chive_format} publishers: diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 8b30d7e..855e6ba 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -122,7 +122,6 @@ {global_env} {local_env} {strip_buildrequires} - rm -f *.tar.{archive_format} perl Build dist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta *.tar.{ar= chive_format} publishers: diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index eae5b6f..e640434 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -122,7 +122,6 @@ {global_env} {local_env} {strip_buildrequires} - rm -f dist/*.tar.{{ archive_format }} $PYTHON ./setup.py sdist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta dist/*.ta= r.{{ archive_format }} publishers: --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list