[libvirt-ci PATCH 2/6] guests: add libvirt-java project packages

Daniel P. Berrangé posted 6 patches 5 years, 9 months ago
[libvirt-ci PATCH 2/6] guests: add libvirt-java project packages
Posted by Daniel P. Berrangé 5 years, 9 months ago
CentOS 8 lacks ant-junit / junit, at least in its default available repos.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 guests/vars/mappings.yml              | 18 ++++++++++++++++++
 guests/vars/projects/libvirt-java.yml |  7 +++++++
 2 files changed, 25 insertions(+)
 create mode 100644 guests/vars/projects/libvirt-java.yml

diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index b33c498..31b5318 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -73,6 +73,20 @@ mappings:
     OpenSUSE: libapparmor-devel
     cross-policy-deb: foreign
 
+  ant:
+    default: ant
+    pkg: apache-ant
+
+  ant-junit:
+    default: ant-junit
+    deb: ant-optional
+    CentOS8:
+    pkg:
+
+  junit:
+    default: junit
+    CentOS8:
+
   augeas:
     default: augeas
     deb: augeas-tools
@@ -279,6 +293,10 @@ mappings:
     rpm: java-11-openjdk-headless
     Debian9: openjdk-8-jre-headless
 
+  jna:
+    default: jna
+    deb: libjna-java
+
   json-glib:
     deb: libjson-glib-dev
     pkg: json-glib
diff --git a/guests/vars/projects/libvirt-java.yml b/guests/vars/projects/libvirt-java.yml
new file mode 100644
index 0000000..7832b4b
--- /dev/null
+++ b/guests/vars/projects/libvirt-java.yml
@@ -0,0 +1,7 @@
+---
+packages:
+  - ant
+  - ant-junit
+  - java
+  - jna
+  - junit
-- 
2.26.2

Re: [libvirt-ci PATCH 2/6] guests: add libvirt-java project packages
Posted by Andrea Bolognani 5 years, 8 months ago
On Mon, 2020-05-11 at 18:22 +0100, Daniel P. Berrangé wrote:
> +  ant-junit:
> +    default: ant-junit
> +    deb: ant-optional
> +    CentOS8:
> +    pkg:

It looks like FreeBSD has the required bits after all:

  $ pkg list apache-ant | grep -i -E 'junit.*jar'
  /usr/local/share/java/apache-ant/lib/ant-junit.jar
  /usr/local/share/java/apache-ant/lib/ant-junit4.jar
  /usr/local/share/java/apache-ant/lib/ant-junitlauncher.jar

so I think this should be

  ant-junit:
    deb: ant-optional
    pkg: apache-ant
    rpm: ant-junit
    CentOS8:

Assuming I'm correct, with that changed,

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

-- 
Andrea Bolognani / Red Hat / Virtualization

Re: [libvirt-ci PATCH 2/6] guests: add libvirt-java project packages
Posted by Daniel P. Berrangé 5 years, 8 months ago
On Thu, May 14, 2020 at 05:40:56PM +0200, Andrea Bolognani wrote:
> On Mon, 2020-05-11 at 18:22 +0100, Daniel P. Berrangé wrote:
> > +  ant-junit:
> > +    default: ant-junit
> > +    deb: ant-optional
> > +    CentOS8:
> > +    pkg:
> 
> It looks like FreeBSD has the required bits after all:
> 
>   $ pkg list apache-ant | grep -i -E 'junit.*jar'
>   /usr/local/share/java/apache-ant/lib/ant-junit.jar
>   /usr/local/share/java/apache-ant/lib/ant-junit4.jar
>   /usr/local/share/java/apache-ant/lib/ant-junitlauncher.jar

Oh yes, that's right.


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