projects: Don't use ~/rpmbuild for osinfo-db

[libvirt] [jenkins-ci PATCH] projects: Don't use ~/rpmbuild for osinfo-db

Posted by Andrea Bolognani 7 years, 6 months ago

Commit 15a19dbc0b73 made sure all explicit calls use
the current directory instead of ~/rpmbuild as workspace,
but osinfo-db wasn't affected by the change since its
build recipe calls the custom 'make rpm' target and
continued storing build artifacts in ~/rpmbuild.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 projects/osinfo-db.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml
index 141a373..d154c98 100644
--- a/projects/osinfo-db.yaml
+++ b/projects/osinfo-db.yaml
@@ -19,7 +19,5 @@
           parent_jobs: 'osinfo-db-master-check'
           machines: '{rpm_machines}'
           command: |
-            rm -f *.tar.{archive_format}
-            $MAKE osinfo-db.spec
             perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db.spec
-            $MAKE rpm
+            rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_sourcedir `pwd`" -ba osinfo-db.spec
-- 
2.17.1

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

Re: [libvirt] [jenkins-ci PATCH] projects: Don't use ~/rpmbuild for osinfo-db

Posted by Daniel P. Berrangé 7 years, 6 months ago

On Thu, Aug 09, 2018 at 03:57:00PM +0200, Andrea Bolognani wrote:
> Commit 15a19dbc0b73 made sure all explicit calls use
> the current directory instead of ~/rpmbuild as workspace,
> but osinfo-db wasn't affected by the change since its
> build recipe calls the custom 'make rpm' target and
> continued storing build artifacts in ~/rpmbuild.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  projects/osinfo-db.yaml | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml
> index 141a373..d154c98 100644
> --- a/projects/osinfo-db.yaml
> +++ b/projects/osinfo-db.yaml
> @@ -19,7 +19,5 @@
>            parent_jobs: 'osinfo-db-master-check'
>            machines: '{rpm_machines}'
>            command: |
> -            rm -f *.tar.{archive_format}
> -            $MAKE osinfo-db.spec
>              perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db.spec
> -            $MAKE rpm
> +            rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_sourcedir `pwd`" -ba osinfo-db.spec


Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

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