[libvirt] [jenkins-ci PATCH v2] Add python3-docutils package for libvirt

Daniel P. Berrangé posted 1 patch 1 week ago
Failed in applying to current master (apply log)
guests/vars/mappings.yml         | 5 +++++
guests/vars/projects/libvirt.yml | 1 +
2 files changed, 6 insertions(+)

[libvirt] [jenkins-ci PATCH v2] Add python3-docutils package for libvirt

Posted by Daniel P. Berrangé 1 week ago
This is needed to acquire the rst2html command line tool

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 guests/vars/mappings.yml         | 5 +++++
 guests/vars/projects/libvirt.yml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index ba0f1cf..81d0916 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -795,6 +795,11 @@ mappings:
     default: polkit
     deb: policykit-1
 
+  python3-docutils:
+    default: python3-docutils
+    CentOS7: python36-docutils
+    FreeBSD: py36-docutils
+
   python2:
     default: python
     Fedora: python2
diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml
index 8fcb286..780a5aa 100644
--- a/guests/vars/projects/libvirt.yml
+++ b/guests/vars/projects/libvirt.yml
@@ -46,6 +46,7 @@ packages:
   - openwsman
   - parted
   - polkit
+  - python3-docutils
   - qemu-img
   - radvd
   - readline
-- 
2.23.0

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

Re: [libvirt] [jenkins-ci PATCH v2] Add python3-docutils package for libvirt

Posted by Andrea Bolognani 6 days ago
On Fri, 2019-11-08 at 14:29 +0000, Daniel P. Berrangé wrote:
> This is needed to acquire the rst2html command line tool
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  guests/vars/mappings.yml         | 5 +++++
>  guests/vars/projects/libvirt.yml | 1 +
>  2 files changed, 6 insertions(+)

Reviewed-by: Andrea Bolognani <abologna@redhat.com>

Do you have other patches you think you might want to get in shortly,
or should I generate new container images once this has been merged?

Also note that, while everywhere else the command name is rst2html,
on CentOS 7 we have to invoke it as rst2html-3... This means patch
3/6 of your other series will need changes.

-- 
Andrea Bolognani / Red Hat / Virtualization

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

Re: [libvirt] [jenkins-ci PATCH v2] Add python3-docutils package for libvirt

Posted by Daniel P. Berrangé 6 days ago
On Fri, Nov 08, 2019 at 06:08:06PM +0100, Andrea Bolognani wrote:
> On Fri, 2019-11-08 at 14:29 +0000, Daniel P. Berrangé wrote:
> > This is needed to acquire the rst2html command line tool
> > 
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >  guests/vars/mappings.yml         | 5 +++++
> >  guests/vars/projects/libvirt.yml | 1 +
> >  2 files changed, 6 insertions(+)
> 
> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
> 
> Do you have other patches you think you might want to get in shortly,
> or should I generate new container images once this has been merged?

Nothing pending. Just pushed this.

> Also note that, while everywhere else the command name is rst2html,
> on CentOS 7 we have to invoke it as rst2html-3... This means patch
> 3/6 of your other series will need changes.

Ugh, annoying :-(

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