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

2017-07-19 Thread Yash Mankad 


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 
---

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 

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

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

2017-07-19 Thread Daniel P. Berrange 
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 
---

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