[libvirt] [jenkins-ci PATCH] Build libosinfo and osinfo-db-tools on mingw platform

Daniel P. Berrangé berrange at redhat.com
Tue May 8 13:37:46 UTC 2018


Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 guests/host_vars/libvirt-fedora-rawhide/main.yml |  2 ++
 guests/vars/mappings.yml                         |  6 ++++++
 guests/vars/projects/libosinfo+mingw.yml         |  8 ++++++++
 guests/vars/projects/osinfo-db-tools+mingw.yml   | 10 ++++++++++
 projects/libosinfo.yaml                          | 12 ++++++++++++
 projects/osinfo-db-tools.yaml                    | 12 ++++++++++++
 6 files changed, 50 insertions(+)
 create mode 100644 guests/vars/projects/libosinfo+mingw.yml
 create mode 100644 guests/vars/projects/osinfo-db-tools+mingw.yml

diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml
index 43555d0..82d46e8 100644
--- a/guests/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml
@@ -4,6 +4,7 @@ PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages
 
 projects:
   - libosinfo
+  - libosinfo+mingw
   - libvirt
   - libvirt+mingw
   - libvirt-cim
@@ -18,6 +19,7 @@ projects:
   - libvirt-tck
   - osinfo-db
   - osinfo-db-tools
+  - osinfo-db-tools+mingw
   - virt-manager
   - virt-viewer
   - virt-viewer+mingw
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index f1777fe..3e33bf1 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -368,6 +368,9 @@ mappings:
   mingw32-gtk-vnc2:
     FedoraRawhide: mingw32-gtk-vnc2
 
+  mingw32-libarchive:
+    FedoraRawhide: mingw32-libarchive
+
   mingw32-libgovirt:
     FedoraRawhide: mingw32-libgovirt
 
@@ -437,6 +440,9 @@ mappings:
   mingw64-gtk-vnc2:
     FedoraRawhide: mingw64-gtk-vnc2
 
+  mingw64-libarchive:
+    FedoraRawhide: mingw64-libarchive
+
   mingw64-libgovirt:
     FedoraRawhide: mingw64-libgovirt
 
diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/projects/libosinfo+mingw.yml
new file mode 100644
index 0000000..e3fc3cb
--- /dev/null
+++ b/guests/vars/projects/libosinfo+mingw.yml
@@ -0,0 +1,8 @@
+---
+packages:
+  - mingw32-glib2
+  - mingw32-libxml2
+  - mingw32-libxslt
+  - mingw64-glib2
+  - mingw64-libxml2
+  - mingw64-libxslt
diff --git a/guests/vars/projects/osinfo-db-tools+mingw.yml b/guests/vars/projects/osinfo-db-tools+mingw.yml
new file mode 100644
index 0000000..578e185
--- /dev/null
+++ b/guests/vars/projects/osinfo-db-tools+mingw.yml
@@ -0,0 +1,10 @@
+---
+packages:
+  - mingw32-glib2
+  - mingw32-libxml2
+  - mingw32-libxslt
+  - mingw32-libarchive
+  - mingw64-glib2
+  - mingw64-libxml2
+  - mingw64-libxslt
+  - mingw64-libarchive
diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml
index 0d25447..8e3d105 100644
--- a/projects/libosinfo.yaml
+++ b/projects/libosinfo.yaml
@@ -13,3 +13,15 @@
       - autotools-rpm-job:
           parent_jobs: 'libosinfo-master-check'
           machines: '{rpm_machines}'
+      - autotools-build-job:
+          parent_jobs: 'osinfo-db-tools-master-build-mingw32'
+          variant: -mingw32
+          local_env: '{mingw32_local_env}'
+          autogen_args: '{mingw32_autogen_args}'
+          machines: '{mingw_machines}'
+      - autotools-build-job:
+          parent_jobs: 'osinfo-db-tools-master-build-mingw64'
+          variant: -mingw64
+          local_env: '{mingw64_local_env}'
+          autogen_args: '{mingw64_autogen_args}'
+          machines: '{mingw_machines}'
diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml
index 6b451ef..cab85af 100644
--- a/projects/osinfo-db-tools.yaml
+++ b/projects/osinfo-db-tools.yaml
@@ -13,3 +13,15 @@
       - autotools-rpm-job:
           parent_jobs: 'osinfo-db-tools-master-check'
           machines: '{rpm_machines}'
+      - autotools-build-job:
+          parent_jobs:
+          variant: -mingw32
+          local_env: '{mingw32_local_env}'
+          autogen_args: '{mingw32_autogen_args}'
+          machines: '{mingw_machines}'
+      - autotools-build-job:
+          parent_jobs:
+          variant: -mingw64
+          local_env: '{mingw64_local_env}'
+          autogen_args: '{mingw64_autogen_args}'
+          machines: '{mingw_machines}'
-- 
2.17.0




More information about the libvir-list mailing list