From nobody Mon Feb 9 22:20:19 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=1642761401; cv=none; d=zohomail.com; s=zohoarc; b=ivuR9xd0Coaz0SZoo1asky1yEe7lEYH66hWjbJI2DxQEJbMNEQg1R+PZ4XcUnoNw7Y8Rgng/PZ0RSGzDN8fLvZHA8sadKdhTODvS8nNymyw5ZaF4axIKFbt4NmN4I9UUkorJu17jk/TmU6yndEl9B+mQl+FbCmJc/EFOknedfsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761401; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=YajubkBpzqSu7VhdeaCmI4EiGOVsjPWXMcqC000uuBCfz+O2BEq+hkpJsWeIaklVPndIP71XdY5g5PtXRhmJ7R8ssJb+qGwUbQPAsCMgks0XzCzrffgUb299M/wIETMbeyuMGhgjeRwTVR/XbcsuCWpEhvHLepXCRBvj1tXKSH4= 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 1642761401697441.926126591138; Fri, 21 Jan 2022 02:36:41 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so21488779wme.0 for ; Fri, 21 Jan 2022 02:36:41 -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 i6sm4972088wma.22.2022.01.21.02.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36: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=o12AYVZgcxipTSbkO0kiXH/iKlyhmo5viyilFO9pQqqRKMPx4BQsi1QFJgfTciYcIb eAWuhI1bpW49Pguxpu9Uxb++VOlPnCHoZ+PjCl8srhdEClEMKO59MT6B8E8MAnD3349D xYWDBp5oWDTzB9LHSIgE88/vCxzr6itkylKorzSsKH+zFdza8ot0IKaLlEuPWUsuWIkl IutsXJkfViHNSNs9OOTQmvrzcHqQjZ/o6fbbxc+UFCOAsoXpWmaqLWCc39+XDaAD+gvt Lh/meuG8vhGhI6UPwMID9/LrZpOnahLG6MG3mxTaHb5VMmdUziF+gYG57/qNNzOU6KH4 99qQ== 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=N0DqrjGciweaOuh5Ki/voN4MlF6XQEosAFqWUd5B3tK0aIvwqRBuNyaGpmYMmmU1uy c7/TqhRC59cRzDX9gdeaqeJUuenwABPjwg26wkbg1d+mG//Xsr5b8+mfMi4+8gBSJrpv TulEW5auWhCgTYkIkNXaQHUTyBUxzP3MuErQ4XUJY0EdWN+w8RRMF6w0q3tCw3gIoXDP OMmf9CBtb/bimp3x03vHKY+ZOkI6T4jRCEkEoN7bLUcyvaCQcNTz5Vr+VWb2BnRxzc36 hV7Nlv8d4hOvvjMeHLe95Bmhrb3a4o/jnzf5p4dTYQN2FrQgV+a9C5fnuzsBejhUmO5b S+fw== X-Gm-Message-State: AOAM530byADT9R57s/5TwWqMusoaCcL1a3Gb8S4CSkPWYe7iLQuLsKJ9 /24DezXdu0MaRwmhVG3UoXE= X-Google-Smtp-Source: ABdhPJy/FgMVEGGLUzf+NBzfL0ZTMU7ewwzzXUPizU7KMpPBdWsDKdrVXRp12Wi59noMzo1Nu8pg4g== X-Received: by 2002:a5d:47cb:: with SMTP id o11mr3291946wrc.698.1642761400003; Fri, 21 Jan 2022 02:36:40 -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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 3/8] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 21 Jan 2022 11:36:18 +0100 Message-Id: <20220121103623.288054-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761405084100001 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