[libvirt] [jenkins-ci PATCH 2/5] jobs: Call rpmbuild and sed consistently

Doing so will allow us to refactor away the common parts. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- 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.{archive_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.{archive_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/*.tar.{{ 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 -- 2.17.1