From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50B9AC433FE for ; Thu, 20 Jan 2022 15:37:34 +0000 (UTC) Received: from localhost ([::1]:46632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAZVE-0007yh-Tz for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 10:37:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVjw-0007P4-KP for qemu-devel@nongnu.org; Thu, 20 Jan 2022 06:36:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:44421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVjs-0002Dz-Sq for qemu-devel@nongnu.org; Thu, 20 Jan 2022 06:36:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642678584; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rjgFJogTejFX7nk8XjUDunKWc0aN7LDUWBOjxroge1g=; b=ei8mq7ywjAFGauqzY4USqCwJavYJOVA3lXeNIr7PIiNyGlZkTCyRT43m211aop3+GMVSAA HIGWQc81SrRL3XZXP2sVFwiUS681uTSQww5/atyclWC0LWgR89AjjECWtTUZnAS6Yo0COa A1npgA2s9PHmnzxNz8XcGMQtdagEzrE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-245-xlKwfigQNmuHVuZHKy18_A-1; Thu, 20 Jan 2022 06:36:07 -0500 X-MC-Unique: xlKwfigQNmuHVuZHKy18_A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8DA8E899621; Thu, 20 Jan 2022 11:36:05 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F3727CD6B; Thu, 20 Jan 2022 11:36:02 +0000 (UTC) Date: Thu, 20 Jan 2022 11:35:59 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH v2 5/6] tests/lcitool: Remove libxml2 Message-ID: References: <20220120110545.263404-1-f4bug@amsat.org> <20220120110545.263404-6-f4bug@amsat.org> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.1.3 (2021-09-10) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.698, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Peter Maydell , Thomas Huth , Ed Maste , qemu-block@nongnu.org, Michael Tokarev , qemu-devel@nongnu.org, Yonggang Luo , Alex =?utf-8?Q?Benn=C3=A9e?= , Li-Wen Hsu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é > >> --- > >> 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 :|