From nobody Mon Feb 9 16:34:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642779713; cv=none; d=zohomail.com; s=zohoarc; b=KwwjAFxq/wtGavwoigEH66N7iQtD8N9zoq/X2BuZUCtNXJQXnGTL0Fz5OOY89Dsj/LY9zR5VJeFG/yrHS62pGyE3qNaeBeINezsEqKauTwuvzrdd+2efxvBU/vgPzrVFDtB2Q6VH3honq8zcmjVNS5fh9TjeYAyi0881t+y9rEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779713; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=cBDU+3JrTU75lin0/wLRR5T+gOtEZn/3PWzO4KRlcqanIln8YtYadSmhFR8EC5D/Jp4kXX8/C71QuY9teSRskN6wcGjSXVQJVKXRx4CKocjOX4OtgJ0HK9TmBPAVw+7LrvSWSzQGSEOCswn3w6hf8IjY4lsdM48ek6W+KlsBTf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1642779712984598.2875366491357; Fri, 21 Jan 2022 07:41:52 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id ba4so390950wrb.4 for ; Fri, 21 Jan 2022 07:41:52 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id g17sm15468482wmq.9.2022.01.21.07.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=J+aux56hQAqZIq5SUPaFmor2vL8WZ+uu2piiHOmTnimEo51SJDE9bxtfSdJWdLsXXa d8hHLVhlRfIkof/EMgBKa5sIUmPWotstlLR8FwkRBHCEyJO6KpHVULKJo5C8AXLjN3BU U6/fFOM67cbuqSnK1sTegFoUBxHb5CIXcFpAHzbOhIGTlqPYYzh3NSk24kL6odP4Swrx PwKwG7mmnAvhyirsjYgIIkvcQx4ACs82HM/5YQbx8CyUYt0MozPpAYCAvoC6vMa/6yhU /MeBtuM9FIr8RCkZwN0Ba3+o6IYHxjE2gRoydl4+lIwtCcFkfJdv+LnqGFstDI2QM9HI 9PTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=rS6osYWKpW1mvDunqrRS8E5HUdUuQSLPAX5qinlwYTCJ1+ULle4aZiFzjjznhhqzS+ iDuCFh6JxH+H9Z3CfXRY5YjLxS1qeJ8CH/i0wyA5YiYuRD8DutuWvUs/beb5NRrj9KXS x0gbdWjKKGpSNlNltUPZDw7n37+2n3xgtSg6PSpJKwMQcKMAF1O4HEwpdBPus6bVKPfw 5YDpxpaRtX/iPFaV8QwcbIb3d/gMAwqS6ztDxDKnAy/EPOXfdZLVrJ6FcyTilFfxlDMa BmdZQwgrPiFSC+sfwwgKXul2FdwFLOrONJHeFm0riB61QPF+5E7nGLGd65lhO5kcaCjy Mdeg== X-Gm-Message-State: AOAM533obfpgI95Wv0jZj5l28mTZkGWI+Imj/yPpM562Zd91BOrx+t9C gV/cU9lWcq82Tg+7CgqFJKo= X-Google-Smtp-Source: ABdhPJwjP6sv73FpGoknIyxzcP3yo0H0lsyrey3X4tpmfuN0epQa6J2FEUP7jBrnK4wb78qDZDqZgQ== X-Received: by 2002:adf:e48c:: with SMTP id i12mr3459790wrm.546.1642779711303; Fri, 21 Jan 2022 07:41:51 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 21 Jan 2022 16:41:30 +0100 Message-Id: <20220121154134.315047-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642779714593100001 The script only include the local qemu.yml for Dockerfiles. Since we want to keep the Cirrus-CI generated files in sync, also use the --data-dir option in generate_cirrus(). Fixes: c45a540f4bd (".gitlab-ci.d/cirrus: auto-generate variables with lcit= ool") Reported-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/lcitool/refresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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=3DNone, trail= er=3DNone): =20 def generate_cirrus(target, trailer=3DNone): filename =3D Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd =3D [lcitool_path, "variables", target, "qemu"] + cmd =3D lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) =20 ubuntu1804_skipssh =3D [ --=20 2.34.1