From nobody Mon Feb 9 21:38:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 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=1642770161; cv=none; d=zohomail.com; s=zohoarc; b=b4TNN7Q+X5SrZtSD9UWRB+PnC08KSwj1FnfSv3DEOK5tobHPtGc3PzO0yUC2wprnYXo1f9eqR0WJiKYgqqu2XRH6hgpH9iECPAbPSXPzQDoZ4ks0lFj5DzXZg8QTadtdOXbh/JnR8PfghM6F8nqAUuSsqY6zvzEeC01dzpevRv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770161; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=eehZki0ql62hvZ2C+jrmey6PmeP1qu8tee4Gn+9okFNsxEdYiZwfjPy3/DID1SXYtG2ZruZPuSFSMkyO/8P9Hz/Zwj8rBnDYkfwB2kBqu9opTdeP8yORZg7aNbQCpsM2Ks7uE6Pz7f1KIPBRjaf6k57Kw/KYP+cIC55Uin+aluc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1642770161295101.46342715369212; Fri, 21 Jan 2022 05:02:41 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso28863754wmj.2 for ; Fri, 21 Jan 2022 05:02:40 -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 h11sm10445354wmb.12.2022.01.21.05.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:39 -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=TOpeKP4BoJYdtK10hWMWCqU3UH7uVY6QCB2Kud0DH4OmTXDyJIgwZPmaZr2op2zjsQ GqtyCICudW7ndJqDLGxjgX6665YRtvPmqmuvoZYfee5vj7DyFFj/dJCjNHoV/yH86FzH LxC4CovXsgqqd/90/IyJpWuB3AYI/1GVuH5SohpHG2qG9ffhP0nbg09bz94/mbQv4oIz eM7YqoW5S2xuKUu4blOo17qLxq+4/p57ZtQ+wLMc28CttBk2B3cXAC9TLdY1eBdDIFGR jaNS+O8troReLv28iRJFPGrnrrY4HvTWvygJOuvXqJ4y7zcMzy/6Pcv2rckM2jp1Q5v2 LCBQ== 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=1XLIYPtqtS/yQZ6vQaT67HdxdGeWEfSRT9hy/BUPy6hMZK64ah8TScrqRlqXqqn1HO Aa9s/8L6h24VjGPUqog/IOqQ6z5DfYkdWJy6gQAlKkaNhqav5xQjhIGeJ3CJg+rF7WZ6 HQrvnNNL9aR4GEMoMXEc4KzCv1ZtnQ676GeD0hUixxpQlaWgRcXFR0OqT5ThtiU/FaGX 9kCubgXRgPRh1XtR+td66slj5qEXwsfrD8JR1UIdCtDn4fXLBqQiQFAH5F4prn+rAmZT yVhuqg0YmjsF4aPXx61NJ0AvJEXuqv63YB3jGpdlAqm+i6JgBS9Pd8UuG7eUR3K+3O+g ulSA== X-Gm-Message-State: AOAM530td9R+8OtTWlZpdKhuZyWHnAmoayvPObeDj1pkexF4bl4svjjx iPNqzU+B4OEmfT1VYAe+s1I= X-Google-Smtp-Source: ABdhPJyq7KXGjlrH/QfYXcdyTTgZT62AZk5ye1TU9uCioxkbCbOhqfU0YZZbrGMEjk72lAAyFgBO5Q== X-Received: by 2002:a05:600c:220f:: with SMTP id z15mr634798wml.145.1642770159613; Fri, 21 Jan 2022 05:02:39 -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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 21 Jan 2022 14:02:18 +0100 Message-Id: <20220121130222.302540-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770162784100001 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