[libvirt] [jenkins-ci PATCH 0/6] Update libosinfo (& friends) dependencies
libsoup & mingw-libsoup are new dependencies for both libosinfo & osinfo-db-tools since v1.6.0 release libcurl & mingw-curl are no longer a dependency for libosinfo since v1.5.0 release Fabiano Fidêncio (6): mappings: Add mingw*-libsoup mingw*-libosinfo: Add mingw*-libsoup as dependency mingw*-osinfo-db-tools: Add mingw*-libsoup as dependency osinfo-db-tools: Add libsoup as dependency mingw*-libosinfo: Remove mingw*-curl dependency ibosinfo: Remove libcurl dependency guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libosinfo+mingw32.yml | 2 +- guests/vars/projects/libosinfo+mingw64.yml | 2 +- guests/vars/projects/libosinfo.yml | 1 - guests/vars/projects/osinfo-db-tools+mingw32.yml | 1 + guests/vars/projects/osinfo-db-tools+mingw64.yml | 1 + guests/vars/projects/osinfo-db-tools.yml | 1 + 7 files changed, 11 insertions(+), 3 deletions(-) -- 2.21.0
mingw*-libsoup is a new dependency, introduced as part of v1.6.0 release, for both mingw*-libosinfo & mingw*-osinfo-db-tools. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/mappings.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 3cf125b..01b55c9 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -487,6 +487,9 @@ mappings: mingw32-libgovirt: FedoraRawhide: mingw32-libgovirt + mingw32-libsoup: + FedoraRawhide: mingw32-liboup + mingw32-libssh2: FedoraRawhide: mingw32-libssh2 @@ -565,6 +568,9 @@ mappings: mingw64-libgovirt: FedoraRawhide: mingw64-libgovirt + mingw64-libsoup: + FedoraRawhide: mingw64-libsoup + mingw64-libssh2: FedoraRawhide: mingw64-libssh2 -- 2.21.0
On Mon, Jul 29, 2019 at 10:41:24AM +0200, Fabiano Fidêncio wrote:
mingw*-libsoup is a new dependency, introduced as part of v1.6.0 release, for both mingw*-libosinfo & mingw*-osinfo-db-tools.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/mappings.yml | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 3cf125b..01b55c9 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -487,6 +487,9 @@ mappings: mingw32-libgovirt: FedoraRawhide: mingw32-libgovirt
+ mingw32-libsoup: + FedoraRawhide: mingw32-liboup
^^^^ libsoup 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 :|
It's been introduced as dependency as part of v1.6.0 release. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/libosinfo+mingw32.yml | 1 + guests/vars/projects/libosinfo+mingw64.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/guests/vars/projects/libosinfo+mingw32.yml b/guests/vars/projects/libosinfo+mingw32.yml index 9435d1f..4c90d27 100644 --- a/guests/vars/projects/libosinfo+mingw32.yml +++ b/guests/vars/projects/libosinfo+mingw32.yml @@ -2,6 +2,7 @@ packages: - mingw32-curl - mingw32-glib2 + - mingw32-libsoup - mingw32-libxml2 - mingw32-libxslt - wget diff --git a/guests/vars/projects/libosinfo+mingw64.yml b/guests/vars/projects/libosinfo+mingw64.yml index b71664e..25965e7 100644 --- a/guests/vars/projects/libosinfo+mingw64.yml +++ b/guests/vars/projects/libosinfo+mingw64.yml @@ -2,6 +2,7 @@ packages: - mingw64-curl - mingw64-glib2 + - mingw64-libsoup - mingw64-libxml2 - mingw64-libxslt - wget -- 2.21.0
On Mon, 2019-07-29 at 10:41 +0200, Fabiano Fidêncio wrote:
It's been introduced as dependency as part of v1.6.0 release.
Is that so? Because the native build has had the dependency on libsoup ever since commit 1eab5a66eb0abd922a67e2c96a4c46efce525548 Author: Andrea Bolognani <abologna@redhat.com> Date: Tue Oct 3 18:11:38 2017 +0200 ansible: Add libosinfo project Signed-off-by: Andrea Bolognani <abologna@redhat.com> eg. the day it was introduced. So it seems to me we just messed up when in commit c74dcf2ea8787c7e6256cb7cee315dbf2148e799 Author: Daniel P. Berrangé <berrange@redhat.com> Date: Tue May 8 14:36:22 2018 +0100 Build libosinfo and osinfo-db-tools on mingw platform Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> we didn't include it among the dependencies for the MinGW build, and we only managed to get away with it so far because it gets dragged in by mingw*-libgovirt, required for virt-viewer+mingw*. The change itself is correct, though :) -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Jul 31, 2019 at 1:54 PM Andrea Bolognani <abologna@redhat.com> wrote:
On Mon, 2019-07-29 at 10:41 +0200, Fabiano Fidêncio wrote:
It's been introduced as dependency as part of v1.6.0 release.
Is that so? Because the native build has had the dependency on libsoup ever since
commit 1eab5a66eb0abd922a67e2c96a4c46efce525548 Author: Andrea Bolognani <abologna@redhat.com> Date: Tue Oct 3 18:11:38 2017 +0200
ansible: Add libosinfo project
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
eg. the day it was introduced. So it seems to me we just messed up when in
Old tests on libosinfo were relying on libsoup and that's the reason I do believe the dependency was there. Pino dropped the dependency a long time ago here: ``` commit b61be0405f678986ac344f414fa907af24670488 Author: Pino Toscano <ptoscano@redhat.com> AuthorDate: Mon Aug 7 18:18:34 2017 +0200 Commit: Christophe Fergeau <cfergeau@redhat.com> CommitDate: Mon Oct 16 11:12:22 2017 +0200 Switch from libsoup to libcurl libsoup is used to check the validity of URLs in distributions in osinfo-db; OTOH it supports only HTTP(S), so this limits the checks to that protocol. To overcome this limitation, switch to libcurl: while it requires slightly more code to do the same task, it provides a bit more flexibility, and support for other protocols. No version check is performed, since the APIs used are old enough. Adapt also the README, and the packaging files. ``` However, libvirt-jenkins-ci was never updated. [snip] Best Regards, -- Fabiano Fidêncio
On Wed, 2019-07-31 at 14:24 +0200, Fabiano Fidêncio wrote:
On Wed, Jul 31, 2019 at 1:54 PM Andrea Bolognani <abologna@redhat.com> wrote:
On Mon, 2019-07-29 at 10:41 +0200, Fabiano Fidêncio wrote:
It's been introduced as dependency as part of v1.6.0 release.
Is that so? Because the native build has had the dependency on libsoup ever since
commit 1eab5a66eb0abd922a67e2c96a4c46efce525548 Author: Andrea Bolognani <abologna@redhat.com> Date: Tue Oct 3 18:11:38 2017 +0200
ansible: Add libosinfo project
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
eg. the day it was introduced. So it seems to me we just messed up when in
Old tests on libosinfo were relying on libsoup and that's the reason I do believe the dependency was there. Pino dropped the dependency a long time ago here:
``` commit b61be0405f678986ac344f414fa907af24670488 Author: Pino Toscano <ptoscano@redhat.com> AuthorDate: Mon Aug 7 18:18:34 2017 +0200 Commit: Christophe Fergeau <cfergeau@redhat.com> CommitDate: Mon Oct 16 11:12:22 2017 +0200
Switch from libsoup to libcurl
libsoup is used to check the validity of URLs in distributions in osinfo-db; OTOH it supports only HTTP(S), so this limits the checks to that protocol.
To overcome this limitation, switch to libcurl: while it requires slightly more code to do the same task, it provides a bit more flexibility, and support for other protocols. No version check is performed, since the APIs used are old enough.
Adapt also the README, and the packaging files. ``` However, libvirt-jenkins-ci was never updated.
Alright, I'll keep your commit message as is but I'll add The native build already depended on libsoup because it was never updated after libosinfo switched its test suite from libsoup to libcurl back in 2017. and then push the series. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Jul 31, 2019 at 2:37 PM Andrea Bolognani <abologna@redhat.com> wrote:
On Wed, 2019-07-31 at 14:24 +0200, Fabiano Fidêncio wrote:
On Wed, Jul 31, 2019 at 1:54 PM Andrea Bolognani <abologna@redhat.com> wrote:
On Mon, 2019-07-29 at 10:41 +0200, Fabiano Fidêncio wrote:
It's been introduced as dependency as part of v1.6.0 release.
Is that so? Because the native build has had the dependency on libsoup ever since
commit 1eab5a66eb0abd922a67e2c96a4c46efce525548 Author: Andrea Bolognani <abologna@redhat.com> Date: Tue Oct 3 18:11:38 2017 +0200
ansible: Add libosinfo project
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
eg. the day it was introduced. So it seems to me we just messed up when in
Old tests on libosinfo were relying on libsoup and that's the reason I do believe the dependency was there. Pino dropped the dependency a long time ago here:
``` commit b61be0405f678986ac344f414fa907af24670488 Author: Pino Toscano <ptoscano@redhat.com> AuthorDate: Mon Aug 7 18:18:34 2017 +0200 Commit: Christophe Fergeau <cfergeau@redhat.com> CommitDate: Mon Oct 16 11:12:22 2017 +0200
Switch from libsoup to libcurl
libsoup is used to check the validity of URLs in distributions in osinfo-db; OTOH it supports only HTTP(S), so this limits the checks to that protocol.
To overcome this limitation, switch to libcurl: while it requires slightly more code to do the same task, it provides a bit more flexibility, and support for other protocols. No version check is performed, since the APIs used are old enough.
Adapt also the README, and the packaging files. ``` However, libvirt-jenkins-ci was never updated.
Alright, I'll keep your commit message as is but I'll add
The native build already depended on libsoup because it was never updated after libosinfo switched its test suite from libsoup to libcurl back in 2017.
and then push the series.
Ack!
It's been introduced as dependency as part of v1.6.0 release. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/osinfo-db-tools+mingw32.yml | 1 + guests/vars/projects/osinfo-db-tools+mingw64.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/guests/vars/projects/osinfo-db-tools+mingw32.yml b/guests/vars/projects/osinfo-db-tools+mingw32.yml index bba44b8..0952d09 100644 --- a/guests/vars/projects/osinfo-db-tools+mingw32.yml +++ b/guests/vars/projects/osinfo-db-tools+mingw32.yml @@ -3,5 +3,6 @@ packages: - mingw32-glib2 - mingw32-json-glib - mingw32-libarchive + - mingw32-libsoup - mingw32-libxml2 - mingw32-libxslt diff --git a/guests/vars/projects/osinfo-db-tools+mingw64.yml b/guests/vars/projects/osinfo-db-tools+mingw64.yml index ac21716..5f099f0 100644 --- a/guests/vars/projects/osinfo-db-tools+mingw64.yml +++ b/guests/vars/projects/osinfo-db-tools+mingw64.yml @@ -3,5 +3,6 @@ packages: - mingw64-glib2 - mingw64-json-glib - mingw64-libarchive + - mingw64-libsoup - mingw64-libxml2 - mingw64-libxslt -- 2.21.0
It's been introduced as dependency as part of v1.6.0 release. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/osinfo-db-tools.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/vars/projects/osinfo-db-tools.yml b/guests/vars/projects/osinfo-db-tools.yml index 773ad93..ad38a1f 100644 --- a/guests/vars/projects/osinfo-db-tools.yml +++ b/guests/vars/projects/osinfo-db-tools.yml @@ -3,6 +3,7 @@ packages: - glib2 - json-glib - libarchive + - libsoup - libxml2 - libxslt - python3 -- 2.21.0
It's been removed as part of v1.5.0 release. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/libosinfo+mingw32.yml | 1 - guests/vars/projects/libosinfo+mingw64.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/guests/vars/projects/libosinfo+mingw32.yml b/guests/vars/projects/libosinfo+mingw32.yml index 4c90d27..5884a09 100644 --- a/guests/vars/projects/libosinfo+mingw32.yml +++ b/guests/vars/projects/libosinfo+mingw32.yml @@ -1,6 +1,5 @@ --- packages: - - mingw32-curl - mingw32-glib2 - mingw32-libsoup - mingw32-libxml2 diff --git a/guests/vars/projects/libosinfo+mingw64.yml b/guests/vars/projects/libosinfo+mingw64.yml index 25965e7..182c784 100644 --- a/guests/vars/projects/libosinfo+mingw64.yml +++ b/guests/vars/projects/libosinfo+mingw64.yml @@ -1,6 +1,5 @@ --- packages: - - mingw64-curl - mingw64-glib2 - mingw64-libsoup - mingw64-libxml2 -- 2.21.0
It's been removed as part of v1.5.0 release. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/libosinfo.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/projects/libosinfo.yml b/guests/vars/projects/libosinfo.yml index d95c4a4..dba691c 100644 --- a/guests/vars/projects/libosinfo.yml +++ b/guests/vars/projects/libosinfo.yml @@ -4,7 +4,6 @@ packages: - glib2 - gobject-introspection - gtk-doc - - libcurl - libsoup - libxml2 - libxslt -- 2.21.0
On Mon, 2019-07-29 at 10:41 +0200, Fabiano Fidêncio wrote:
libsoup & mingw-libsoup are new dependencies for both libosinfo & osinfo-db-tools since v1.6.0 release libcurl & mingw-curl are no longer a dependency for libosinfo since v1.5.0 release
Fabiano Fidêncio (6): mappings: Add mingw*-libsoup mingw*-libosinfo: Add mingw*-libsoup as dependency mingw*-osinfo-db-tools: Add mingw*-libsoup as dependency osinfo-db-tools: Add libsoup as dependency mingw*-libosinfo: Remove mingw*-curl dependency ibosinfo: Remove libcurl dependency
Aside from the typo in 1/6 Dan already pointed out and the question of the commit message of 2/6 not being AFAICT accurate, one more meta-comment is that 3-4/6 and 5-6/6 should be squashed together: I have already done so locally, so as soon as you clear up the situation for 2/6 I can push the entire series with my Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
On Wed, 2019-07-31 at 13:56 +0200, Andrea Bolognani wrote:
On Mon, 2019-07-29 at 10:41 +0200, Fabiano Fidêncio wrote:
libsoup & mingw-libsoup are new dependencies for both libosinfo & osinfo-db-tools since v1.6.0 release libcurl & mingw-curl are no longer a dependency for libosinfo since v1.5.0 release
Fabiano Fidêncio (6): mappings: Add mingw*-libsoup mingw*-libosinfo: Add mingw*-libsoup as dependency mingw*-osinfo-db-tools: Add mingw*-libsoup as dependency osinfo-db-tools: Add libsoup as dependency mingw*-libosinfo: Remove mingw*-curl dependency ibosinfo: Remove libcurl dependency
Aside from the typo in 1/6 Dan already pointed out and the question of the commit message of 2/6 not being AFAICT accurate, one more meta-comment is that 3-4/6 and 5-6/6 should be squashed together: I have already done so locally, so as soon as you clear up the situation for 2/6 I can push the entire series with my
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Oh, forgot to mention: it looks like osinfo-db-tools and libosinfo can no longer be built successfully on Ubuntu 16.04: $ ../autogen.sh --prefix=$VIRT_PREFIX autoreconf: Entering directory `.' autoreconf: running: autopoint --force autopoint: *** The AM_GNU_GETTEXT_VERSION declaration in your configure.ac file requires the infrastructure from gettext-0.19.8 but this version is older. Please upgrade to gettext-0.19.8 or newer. autopoint: *** Stop. autoreconf: autopoint failed with exit status: 1 $ The osinfo-db test suite fails as well. If this was unintentional, then it needs to be addressed; if it was intended, then the data in libvirt-jenkins-ci.git needs to be updated accordingly. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Jul 31, 2019 at 2:16 PM Andrea Bolognani <abologna@redhat.com> wrote:
On Wed, 2019-07-31 at 13:56 +0200, Andrea Bolognani wrote:
On Mon, 2019-07-29 at 10:41 +0200, Fabiano Fidêncio wrote:
libsoup & mingw-libsoup are new dependencies for both libosinfo & osinfo-db-tools since v1.6.0 release libcurl & mingw-curl are no longer a dependency for libosinfo since v1.5.0 release
Fabiano Fidêncio (6): mappings: Add mingw*-libsoup mingw*-libosinfo: Add mingw*-libsoup as dependency mingw*-osinfo-db-tools: Add mingw*-libsoup as dependency osinfo-db-tools: Add libsoup as dependency mingw*-libosinfo: Remove mingw*-curl dependency ibosinfo: Remove libcurl dependency
Aside from the typo in 1/6 Dan already pointed out and the question of the commit message of 2/6 not being AFAICT accurate, one more meta-comment is that 3-4/6 and 5-6/6 should be squashed together: I have already done so locally, so as soon as you clear up the situation for 2/6 I can push the entire series with my
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Oh, forgot to mention: it looks like osinfo-db-tools and libosinfo can no longer be built successfully on Ubuntu 16.04:
$ ../autogen.sh --prefix=$VIRT_PREFIX autoreconf: Entering directory `.' autoreconf: running: autopoint --force autopoint: *** The AM_GNU_GETTEXT_VERSION declaration in your configure.ac file requires the infrastructure from gettext-0.19.8 but this version is older. Please upgrade to gettext-0.19.8 or newer. autopoint: *** Stop. autoreconf: autopoint failed with exit status: 1 $
The osinfo-db test suite fails as well. If this was unintentional, then it needs to be addressed; if it was intended, then the data in libvirt-jenkins-ci.git needs to be updated accordingly.
That's a really nice catch! I'm surprised (but not that much) that we never heard any complains about this before. In any case, I've provided two merge-requests fixing this issue: - https://gitlab.com/libosinfo/libosinfo/merge_requests/3 - https://gitlab.com/libosinfo/osinfo-db-tools/merge_requests/3 Best Regards, -- Fabiano Fidêncio
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Fabiano Fidêncio