On Thu, Jan 20, 2022 at 12:18:34PM +0100, Philippe Mathieu-Daudé wrote: > On 1/20/22 12:14, Daniel P. Berrangé wrote: > > On Thu, Jan 20, 2022 at 12:05:44PM +0100, Philippe Mathieu-Daudé wrote: > >> The previous commit removed all uses of libxml2. > >> > >> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > >> --- > >> tests/docker/dockerfiles/alpine.docker | 1 - > >> tests/docker/dockerfiles/centos8.docker | 1 - > >> tests/docker/dockerfiles/fedora.docker | 1 - > >> tests/docker/dockerfiles/opensuse-leap.docker | 1 - > >> tests/docker/dockerfiles/ubuntu1804.docker | 1 - > >> tests/docker/dockerfiles/ubuntu2004.docker | 1 - > >> tests/lcitool/projects/qemu.yml | 1 - > >> 7 files changed, 7 deletions(-) > > > > Did you change these dockerfiles manually ? > > No. > > > There is an 'make lcitool-refresh' target that does it automatically, > > and this should have refreshed the Cirrus CI config files too which > > are missed here. > > Odd: > > $ make lcitool-refresh > GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3 > tests/fp/berkeley-softfloat-3 dtc capstone slirp > Generate tests/docker/dockerfiles/centos8.docker > Generate tests/docker/dockerfiles/fedora.docker > Generate tests/docker/dockerfiles/ubuntu1804.docker > Generate tests/docker/dockerfiles/ubuntu2004.docker > Generate tests/docker/dockerfiles/opensuse-leap.docker > Generate tests/docker/dockerfiles/alpine.docker > Generate .gitlab-ci.d/cirrus/freebsd-12.vars > Generate .gitlab-ci.d/cirrus/freebsd-13.vars > Generate .gitlab-ci.d/cirrus/macos-11.vars > > OK, this fixed it: > > -- >8 -- > diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh > index 033120e223d..25301f2ef0b 100755 > --- a/tests/lcitool/refresh > +++ b/tests/lcitool/refresh > @@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None, > trailer=None): > > def generate_cirrus(target, trailer=None): > filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") > - cmd = [lcitool_path, "variables", target, "qemu"] > + cmd = lcitool_cmd + ["variables", target, "qemu"] > generate(filename, cmd, trailer)
Wierd, I wonder why that didn't result in an error. I must have screwed this up in a rebase at some point after i created the .vars files originally. Will you send this as a fix too in a v3. 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 :|