[libvirt] [jenkins-ci PATCH 1/3] guests: Split MinGW projects

[Andrea Bolognani]

The 32-bit and 64-bit MinGW builds require almost
completely different sets of packages, so it makes
sense to split them off into separate pseudo-projects
in order to have more control over what gets
installed on each host.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 guests/host_vars/libvirt-fedora-rawhide/main.yml  | 15 ++++++++++-----
 ...{libosinfo+mingw.yml => libosinfo+mingw32.yml} |  4 ----
 ...{libosinfo+mingw.yml => libosinfo+mingw64.yml} |  4 ----
 .../{libvirt+mingw.yml => libvirt+mingw32.yml}    | 12 ------------
 .../{libvirt+mingw.yml => libvirt+mingw64.yml}    | 12 ------------
 ...rt-glib+mingw.yml => libvirt-glib+mingw32.yml} |  2 --
 ...rt-glib+mingw.yml => libvirt-glib+mingw64.yml} |  2 --
 ...ools+mingw.yml => osinfo-db-tools+mingw32.yml} |  4 ----
 ...glib+mingw.yml => osinfo-db-tools+mingw64.yml} |  4 ++--
 ...t-viewer+mingw.yml => virt-viewer+mingw32.yml} | 11 -----------
 ...t-viewer+mingw.yml => virt-viewer+mingw64.yml} | 11 -----------
 11 files changed, 12 insertions(+), 69 deletions(-)
 copy guests/vars/projects/{libosinfo+mingw.yml => libosinfo+mingw32.yml} (56%)
 rename guests/vars/projects/{libosinfo+mingw.yml => libosinfo+mingw64.yml} (56%)
 copy guests/vars/projects/{libvirt+mingw.yml => libvirt+mingw32.yml} (51%)
 rename guests/vars/projects/{libvirt+mingw.yml => libvirt+mingw64.yml} (51%)
 copy guests/vars/projects/{libvirt-glib+mingw.yml => libvirt-glib+mingw32.yml} (57%)
 copy guests/vars/projects/{libvirt-glib+mingw.yml => libvirt-glib+mingw64.yml} (57%)
 rename guests/vars/projects/{osinfo-db-tools+mingw.yml => osinfo-db-tools+mingw32.yml} (53%)
 rename guests/vars/projects/{libvirt-glib+mingw.yml => osinfo-db-tools+mingw64.yml} (54%)
 copy guests/vars/projects/{virt-viewer+mingw.yml => virt-viewer+mingw32.yml} (52%)
 rename guests/vars/projects/{virt-viewer+mingw.yml => virt-viewer+mingw64.yml} (52%)

diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml
index 1bd3332..4318653 100644
--- a/guests/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml
@@ -1,13 +1,16 @@
 ---
 projects:
   - libosinfo
-  - libosinfo+mingw
+  - libosinfo+mingw32
+  - libosinfo+mingw64
   - libvirt
-  - libvirt+mingw
+  - libvirt+mingw32
+  - libvirt+mingw64
   - libvirt-cim
   - libvirt-dbus
   - libvirt-glib
-  - libvirt-glib+mingw
+  - libvirt-glib+mingw32
+  - libvirt-glib+mingw64
   - libvirt-go
   - libvirt-go-xml
   - libvirt-perl
@@ -16,10 +19,12 @@ projects:
   - libvirt-tck
   - osinfo-db
   - osinfo-db-tools
-  - osinfo-db-tools+mingw
+  - osinfo-db-tools+mingw32
+  - osinfo-db-tools+mingw64
   - virt-manager
   - virt-viewer
-  - virt-viewer+mingw
+  - virt-viewer+mingw32
+  - virt-viewer+mingw64
 
 package_format: rpm
 os_name: Fedora
diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/projects/libosinfo+mingw32.yml
similarity index 56%
copy from guests/vars/projects/libosinfo+mingw.yml
copy to guests/vars/projects/libosinfo+mingw32.yml
index 0eb27af..9435d1f 100644
--- a/guests/vars/projects/libosinfo+mingw.yml
+++ b/guests/vars/projects/libosinfo+mingw32.yml
@@ -4,8 +4,4 @@ packages:
   - mingw32-glib2
   - mingw32-libxml2
   - mingw32-libxslt
-  - mingw64-curl
-  - mingw64-glib2
-  - mingw64-libxml2
-  - mingw64-libxslt
   - wget
diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/projects/libosinfo+mingw64.yml
similarity index 56%
rename from guests/vars/projects/libosinfo+mingw.yml
rename to guests/vars/projects/libosinfo+mingw64.yml
index 0eb27af..b71664e 100644
--- a/guests/vars/projects/libosinfo+mingw.yml
+++ b/guests/vars/projects/libosinfo+mingw64.yml
@@ -1,9 +1,5 @@
 ---
 packages:
-  - mingw32-curl
-  - mingw32-glib2
-  - mingw32-libxml2
-  - mingw32-libxslt
   - mingw64-curl
   - mingw64-glib2
   - mingw64-libxml2
diff --git a/guests/vars/projects/libvirt+mingw.yml b/guests/vars/projects/libvirt+mingw32.yml
similarity index 51%
copy from guests/vars/projects/libvirt+mingw.yml
copy to guests/vars/projects/libvirt+mingw32.yml
index 063e6a4..2fc6603 100644
--- a/guests/vars/projects/libvirt+mingw.yml
+++ b/guests/vars/projects/libvirt+mingw32.yml
@@ -12,15 +12,3 @@ packages:
   - mingw32-pkg-config
   - mingw32-portablexdr
   - mingw32-readline
-  - mingw64-curl
-  - mingw64-dbus
-  - mingw64-dlfcn
-  - mingw64-gcc
-  - mingw64-gettext
-  - mingw64-gnutls
-  - mingw64-libssh2
-  - mingw64-libxml2
-  - mingw64-openssl
-  - mingw64-pkg-config
-  - mingw64-portablexdr
-  - mingw64-readline
diff --git a/guests/vars/projects/libvirt+mingw.yml b/guests/vars/projects/libvirt+mingw64.yml
similarity index 51%
rename from guests/vars/projects/libvirt+mingw.yml
rename to guests/vars/projects/libvirt+mingw64.yml
index 063e6a4..615ecec 100644
--- a/guests/vars/projects/libvirt+mingw.yml
+++ b/guests/vars/projects/libvirt+mingw64.yml
@@ -1,17 +1,5 @@
 ---
 packages:
-  - mingw32-curl
-  - mingw32-dbus
-  - mingw32-dlfcn
-  - mingw32-gcc
-  - mingw32-gettext
-  - mingw32-gnutls
-  - mingw32-libssh2
-  - mingw32-libxml2
-  - mingw32-openssl
-  - mingw32-pkg-config
-  - mingw32-portablexdr
-  - mingw32-readline
   - mingw64-curl
   - mingw64-dbus
   - mingw64-dlfcn
diff --git a/guests/vars/projects/libvirt-glib+mingw.yml b/guests/vars/projects/libvirt-glib+mingw32.yml
similarity index 57%
copy from guests/vars/projects/libvirt-glib+mingw.yml
copy to guests/vars/projects/libvirt-glib+mingw32.yml
index 49b9c6a..7e355c0 100644
--- a/guests/vars/projects/libvirt-glib+mingw.yml
+++ b/guests/vars/projects/libvirt-glib+mingw32.yml
@@ -1,6 +1,4 @@
 ---
 packages:
   - mingw32-glib2
-  - mingw64-glib2
   - mingw32-libxml2
-  - mingw64-libxml2
diff --git a/guests/vars/projects/libvirt-glib+mingw.yml b/guests/vars/projects/libvirt-glib+mingw64.yml
similarity index 57%
copy from guests/vars/projects/libvirt-glib+mingw.yml
copy to guests/vars/projects/libvirt-glib+mingw64.yml
index 49b9c6a..452f82f 100644
--- a/guests/vars/projects/libvirt-glib+mingw.yml
+++ b/guests/vars/projects/libvirt-glib+mingw64.yml
@@ -1,6 +1,4 @@
 ---
 packages:
-  - mingw32-glib2
   - mingw64-glib2
-  - mingw32-libxml2
   - mingw64-libxml2
diff --git a/guests/vars/projects/osinfo-db-tools+mingw.yml b/guests/vars/projects/osinfo-db-tools+mingw32.yml
similarity index 53%
rename from guests/vars/projects/osinfo-db-tools+mingw.yml
rename to guests/vars/projects/osinfo-db-tools+mingw32.yml
index 578e185..b133331 100644
--- a/guests/vars/projects/osinfo-db-tools+mingw.yml
+++ b/guests/vars/projects/osinfo-db-tools+mingw32.yml
@@ -4,7 +4,3 @@ packages:
   - mingw32-libxml2
   - mingw32-libxslt
   - mingw32-libarchive
-  - mingw64-glib2
-  - mingw64-libxml2
-  - mingw64-libxslt
-  - mingw64-libarchive
diff --git a/guests/vars/projects/libvirt-glib+mingw.yml b/guests/vars/projects/osinfo-db-tools+mingw64.yml
similarity index 54%
rename from guests/vars/projects/libvirt-glib+mingw.yml
rename to guests/vars/projects/osinfo-db-tools+mingw64.yml
index 49b9c6a..049418c 100644
--- a/guests/vars/projects/libvirt-glib+mingw.yml
+++ b/guests/vars/projects/osinfo-db-tools+mingw64.yml
@@ -1,6 +1,6 @@
 ---
 packages:
-  - mingw32-glib2
   - mingw64-glib2
-  - mingw32-libxml2
   - mingw64-libxml2
+  - mingw64-libxslt
+  - mingw64-libarchive
diff --git a/guests/vars/projects/virt-viewer+mingw.yml b/guests/vars/projects/virt-viewer+mingw32.yml
similarity index 52%
copy from guests/vars/projects/virt-viewer+mingw.yml
copy to guests/vars/projects/virt-viewer+mingw32.yml
index 5499dfe..2b914c3 100644
--- a/guests/vars/projects/virt-viewer+mingw.yml
+++ b/guests/vars/projects/virt-viewer+mingw32.yml
@@ -12,14 +12,3 @@ packages:
   - mingw32-rest
   - mingw32-spice-gtk3
   - mingw32-usbredir
-  - mingw64-glib2
-  - mingw64-glib-networking
-  - mingw64-gstreamer1-plugins-bad-free
-  - mingw64-gstreamer1-plugins-good
-  - mingw64-gtk3
-  - mingw64-gtk-vnc2
-  - mingw64-libgovirt
-  - mingw64-libusbx
-  - mingw64-rest
-  - mingw64-spice-gtk3
-  - mingw64-usbredir
diff --git a/guests/vars/projects/virt-viewer+mingw.yml b/guests/vars/projects/virt-viewer+mingw64.yml
similarity index 52%
rename from guests/vars/projects/virt-viewer+mingw.yml
rename to guests/vars/projects/virt-viewer+mingw64.yml
index 5499dfe..6b42a7f 100644
--- a/guests/vars/projects/virt-viewer+mingw.yml
+++ b/guests/vars/projects/virt-viewer+mingw64.yml
@@ -1,17 +1,6 @@
 ---
 packages:
   - icoutils
-  - mingw32-glib2
-  - mingw32-glib-networking
-  - mingw32-gstreamer1-plugins-bad-free
-  - mingw32-gstreamer1-plugins-good
-  - mingw32-gtk3
-  - mingw32-gtk-vnc2
-  - mingw32-libgovirt
-  - mingw32-libusbx
-  - mingw32-rest
-  - mingw32-spice-gtk3
-  - mingw32-usbredir
   - mingw64-glib2
   - mingw64-glib-networking
   - mingw64-gstreamer1-plugins-bad-free
-- 
2.17.1