From nobody Tue May 13 12:04:12 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 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