1. Patchew
  2. Libvirt
  3. View series

[libvirt] [PATCH jenkins-ci] Put all RPM build files in GIT checkout build dir

Daniel P. Berrange posted 1 patch 6 years, 9 months ago
Failed in applying to current master (apply log)
jobs/autotools.yaml        | 2 +-
jobs/perl-makemaker.yaml   | 2 +-
jobs/perl-modulebuild.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[libvirt] [PATCH jenkins-ci] Put all RPM build files in GIT checkout build dir
Posted by Daniel P. Berrange 6 years, 9 months ago 
The CI system slaves keep running out of space due to /home/jenkins/rpmbuild
filling up disk.  If we tell rpmbuild to put its files in `pwd`/rpmbuild
instead, that'll end up in the GIT checkout of the module in question. Jenkins
does a 'git clean' after checkout, so this conveniently blows away the RPM
files from previous builds preventing disk usage growing without bound.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

Pushed to fix the CI system

 jobs/autotools.yaml        | 2 +-
 jobs/perl-makemaker.yaml   | 2 +-
 jobs/perl-modulebuild.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml
index a2241b2..3e4fdc2 100644
--- a/jobs/autotools.yaml
+++ b/jobs/autotools.yaml
@@ -171,7 +171,7 @@
           sed -i -e 's/BuildRequires: pkgconfig(libvirt.*).*//' {name}.spec
           rm -f *.tar.{archive_format}
           $MAKE -j{smp} dist
-          rpmbuild -ta {name}-*.tar.{archive_format}
+          rpmbuild --define "_topdir `pwd`/rpmbuild" -ta {name}-*.tar.{archive_format}
     publishers:
       - email:
           recipients: '{obj:spam}'
diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml
index b13d7cc..2df5882 100644
--- a/jobs/perl-makemaker.yaml
+++ b/jobs/perl-makemaker.yaml
@@ -122,7 +122,7 @@
           sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec
           rm -f *.tar.{archive_format}
           make -j{smp} dist
-          rpmbuild -ta *.tar.{archive_format}
+          rpmbuild --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 ba4d606..cb81de1 100644
--- a/jobs/perl-modulebuild.yaml
+++ b/jobs/perl-modulebuild.yaml
@@ -122,7 +122,7 @@
           sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec
           rm -f *.tar.{archive_format}
           perl Build dist
-          rpmbuild -ta *.tar.{archive_format}
+          rpmbuild --define "_topdir `pwd`/rpmbuild" -ta *.tar.{archive_format}
     publishers:
       - email:
           recipients: '{obj:spam}'
-- 
2.13.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH jenkins-ci] Put all RPM build files in GIT checkout build dir
Posted by Yash Mankad 6 years, 9 months ago 
On 07/19/2017 11:39 AM, Daniel P. Berrange wrote:
> The CI system slaves keep running out of space due to /home/jenkins/rpmbuild
> filling up disk.  If we tell rpmbuild to put its files in `pwd`/rpmbuild
> instead, that'll end up in the GIT checkout of the module in question. Jenkins
> does a 'git clean' after checkout, so this conveniently blows away the RPM
> files from previous builds preventing disk usage growing without bound.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>
> Pushed to fix the CI system
>
>   jobs/autotools.yaml        | 2 +-
>   jobs/perl-makemaker.yaml   | 2 +-
>   jobs/perl-modulebuild.yaml | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml
> index a2241b2..3e4fdc2 100644
> --- a/jobs/autotools.yaml
> +++ b/jobs/autotools.yaml
> @@ -171,7 +171,7 @@
>             sed -i -e 's/BuildRequires: pkgconfig(libvirt.*).*//' {name}.spec
>             rm -f *.tar.{archive_format}
>             $MAKE -j{smp} dist
> -          rpmbuild -ta {name}-*.tar.{archive_format}
> +          rpmbuild --define "_topdir `pwd`/rpmbuild" -ta {name}-*.tar.{archive_format}
>       publishers:
>         - email:
>             recipients: '{obj:spam}'
> diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml
> index b13d7cc..2df5882 100644
> --- a/jobs/perl-makemaker.yaml
> +++ b/jobs/perl-makemaker.yaml
> @@ -122,7 +122,7 @@
>             sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec
>             rm -f *.tar.{archive_format}
>             make -j{smp} dist
> -          rpmbuild -ta *.tar.{archive_format}
> +          rpmbuild --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 ba4d606..cb81de1 100644
> --- a/jobs/perl-modulebuild.yaml
> +++ b/jobs/perl-modulebuild.yaml
> @@ -122,7 +122,7 @@
>             sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec
>             rm -f *.tar.{archive_format}
>             perl Build dist
> -          rpmbuild -ta *.tar.{archive_format}
> +          rpmbuild --define "_topdir `pwd`/rpmbuild" -ta *.tar.{archive_format}
>       publishers:
>         - email:
>             recipients: '{obj:spam}'

Reviewed-by: Yash Mankad <ymankad@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.