On Fri, 2020-06-19 at 15:23 +0100, Daniel P. Berrangé wrote: > On Thu, Jun 18, 2020 at 12:01:13PM +0200, Andrea Bolognani wrote: > > Speaking of which, I suggest that we start organizing the script for > > git builds a bit differently: [...] > > > > This avoids the unnecessary initial pushd/cd combination, keeps > > builds for each project neatly separated, and avoids using relative > > paths for most things. What do you think? > > For now I'd rather keep the consistent approach we've already used > for other repos. I think there might be better ways to deal with > the builds later, perhaps using cross-repo include files for the > deps. Sounds good. As I said somewhere else we're going to need at least a second pass anyway :) With regards to the idea of having common include files, that's something that is done quite commonly in large GitLab instances such as those for Debian[1] or freedesktop.org[2], and I definitely support exploring it as a way to reduce the amount of repetitive code we have to keep in each project's .gitlab-ci.yml. > > > +HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|centos|opensuse)') > > > > According to > > > > host_vars/libvirt-opensuse-151/main.yml > > playbooks/build/projects/libvirt-sandbox.yml > > > > in libvirt-ci, libvirt-sandbox can be built on openSUSE just fine; > > I just tried it locally to double-check and had no problems with it > > either. So, please don't exclude openSUSE here. > > That was doing a from git build, where as this is doing a from dist > build, but I've found the missing packages for this now. Right, the dist build is the one I tried. Of course I had to install the libvirt-glib package first :) > > > +for host in $HOSTS > > > +do > > > + if test "$host" = "libvirt-ubuntu-2004" > > > + then > > > + $LCITOOL dockerfile $host libvirt+minimal,libvirt-glib,libvirt-sandbox > $host.Dockerfile > > > + else > > > + $LCITOOL dockerfile $host libvirt+dist,libvirt-glib+dist,libvirt-sandbox > $host.Dockerfile > > > > This fails for me because libvirt-glib+dist is not know to lcitool. > > I assume you have local patches that add the project - can you please > > open a MR against libvirt-ci and mention it in the commit message, so > > that I can check everything locally during review? > > Yes I have libvirt-ci changes to submit after this is finalized. I see you've created the merge request now. Please just open it at the same time in the future, thanks! [1] https://salsa.debian.org/salsa-ci-team/pipeline [2] https://gitlab.freedesktop.org/freedesktop/ci-templates -- Andrea Bolognani / Red Hat / Virtualization
