From patchwork Mon Jan 24 20:15:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 534517 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3142046imr; Mon, 24 Jan 2022 12:23:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAJbDWD3YihnVO0AHooZcs1lhHDdyIvczObgDSTzEpnuj+JOf4CIokEhCrQ5gEylW/RI1q X-Received: by 2002:a05:6602:168d:: with SMTP id s13mr8739059iow.55.1643055824135; Mon, 24 Jan 2022 12:23:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643055824; cv=none; d=google.com; s=arc-20160816; b=wM4OYPAk2g3i67vvPn5FgY6mP3REeBReLTqWWbMe//CVWq1me1QUiWQpshNYWznETp hRLigqynbA4wvKoHJbFn/1MUiXfzcX2e6il2gS0UziuFCOzxKLBJAos1ISLpoLdCx0uh t272iMALHPFLYjqevahAc02hi1WI19KbAxRjl/acWw9/gJZGiShLNHwkcu1T4gxpQfvi EUdY7DYgBHXNB1V1TfyhdZUmKe05PjClsdjKJ5ZaATG38sY0X2PCk5ZaSQfQSofIZrIJ ev8ubbr2TwBBiX1eh4LSLlJnQ2SFUbY6FdrcDX73Z3d48byq43Wu6ETUJ2tiTSOsVZoA cGlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=WwQt43irj7rm302zSIC5pBYW4+QTRQTsXzXbo7p8Q+o=; b=k72Ndq5a98RjKX316Tixxl7gxb135+wq1Nt77fzhHPxzmrdGT6+gUXrRvgnr7TZOaS JE87CRWJf+ExLEL3JpC2J395Ayl5zr08mx9y9VbtHJEG9iLijWt8n8ZbJK0T/uFt/mDv 4KMjx9lszKGf8/X5FXt5yBrJ4/fpYIET1hdP/o9sDGg3K1nbVFAbb3e3bOHPWxilq8/A E7X7XcAYv+QCGv7+iXc6lFpwYijeO6IyxszeYUFbLfjwmiNdL0VKFFHXOf00hseLPlsH OhTu267nBJfFsMW82cBfz4V8iPkuhDjhF2kRmQNeiZ6cjHPZFBtCpM10O4Ts2f6sV6bf vGoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JTdmoRVV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g9si7927627iov.52.2022.01.24.12.23.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:23:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JTdmoRVV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5sN-0003iG-8e for patch@linaro.org; Mon, 24 Jan 2022 15:23:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lJ-0006bq-BI for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:26 -0500 Received: from [2a00:1450:4864:20::629] (port=33630 helo=mail-ej1-x629.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lF-0003E6-E8 for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:23 -0500 Received: by mail-ej1-x629.google.com with SMTP id jx6so24697425ejb.0 for ; Mon, 24 Jan 2022 12:16:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WwQt43irj7rm302zSIC5pBYW4+QTRQTsXzXbo7p8Q+o=; b=JTdmoRVVzdDGZfAvT6r5W92MIobkS1cOS//T0DmSJ28E8j/yB3lQe7nJeRfzkyHuzV oBnIc871CxmP2hV7+3ZKlKX38hLuyuygNfDa8FbYiL3YiNXr/9HHo6fiaQ3RfF+PwXiP ng69GUeLPvS76+8SMYxvtsNvnuzq21+QRo56BJsATowgd2jSqL05Hd43f4QJ5mZTzgTR CkEDKC/TVxWtulJOv0I4+wd/uCZaiOqCv1cLeLil4T58vu0psMFGmr3j4wZEm1CyIuQJ imCgP02PeSrJSDQuR/rQPpk9bPkXAFyU16FKnCs0acCkJYe41UrScivn3Pvy/nARPkkQ JBZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WwQt43irj7rm302zSIC5pBYW4+QTRQTsXzXbo7p8Q+o=; b=xZCDvXqUROTRN80vNLhGoJFcAG3ImwbIgZ7pHhnWL8lVQGtODDi9WxLMqNLHdoCYsr ssAo4xzMtsJXe050bar5MbCz6QB0wvb7l2gKgiZ+5CN6LHhs9G7CwzIYiMosyI7iGqcx 9T1qcJvk+o3QBuC9Q56hfMM3M5bNuOgPWOKktr6xOO1mx30mv67KthECzl/sRth+aRht vKruf6+KEx71fm7qOpxLqKYPEEj7fJUGVnun0N5ZOce+2pozxnmCSrjakahs+kajm5cx z+BAcEMhLrSyE4OBPRLzweEQxWBfMdkPeE+sKZUTslo6mTWCvBT7nGfPzLQz+NIXdjiJ RDDw== X-Gm-Message-State: AOAM5317majp4bdC6cldVYnlE7xq+c5BJCraiEUkW9bOgC/4WgEGAzhs NKqw/n9WgseKAZlXmXamNg0t1Q== X-Received: by 2002:a17:906:7306:: with SMTP id di6mr13410799ejc.255.1643055380031; Mon, 24 Jan 2022 12:16:20 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c14sm7119954edy.66.2022.01.24.12.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:14 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C6141FFBF; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/22] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Mon, 24 Jan 2022 20:15:53 +0000 Message-Id: <20220124201608.604599-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::629 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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 lcitool") Reported-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-4-f4bug@amsat.org> --- tests/lcitool/refresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223..25301f2ef0 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) ubuntu1804_skipssh = [