On Wed, Jun 24, 2020 at 07:16:16PM +0200, Andrea Bolognani wrote:
On Wed, 2020-06-24 at 17:26 +0100, Daniel P. Berrangé wrote:
The dbus build needs to validate one axis
- A variety of libvirt versions
We test a variety of libvirt versions by running a build against the distro provided libvirt packages. All that is then missing is a build against the latest libvirt git master, which only needs to be run on a single distro, for which CentOS 8 is picked as a stable long life base.
This...
+++ b/.gitlab-ci.yml +x64-centos-8-git-build: + <<: *git_native_build_job_definition + variables: + NAME: centos-8 + +x64-centos-stream-git-build: + <<: *git_native_build_job_definition + variables: + NAME: centos-stream
... contradicts this...
+++ b/ci/containers/refresh +for host in $HOSTS +do + if test "$host" = "libvirt-centos-8" || test "$host" = "libvirt-centos-stream" + then + $LCITOOL dockerfile $host libvirt+minimal,libvirt-glib,libvirt-dbus > $host.Dockerfile
... and this.
What's the rationale for building libvirt and libvirt-glib from git on CentOS Stream in addition to CentOS 8?
There's something odd with the repos, probably due to modularity. The end result is that the libvirt-gobject-devel packages are missing, and I've not found where they might live. This affects 8 & 8-Stream the same.
+ if test "$host" = "libvirt-debian-9" || test "$host" = "libvirt-ubuntu-1804" + then + sed -i -e 's/libvirt-dev/libvirt-dev libvirt-daemon/' $host.Dockerfile
This line is not indented correctly.
Additionally, please add a comment explaining why this hack is needed in the first place, something along the lines of
Before Debian version 4.10.0-2, some of the runtime files needed by libvirt were mistakenly shipped in the libvirt-daemon package
One more nitpick: the conditional would look nicer and be easier to tweak later as
if test "$host" = "libvirt-debian-9" || test "$host" = "libvirt-ubuntu-1804" then
Same applies above.
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 :|