From patchwork Wed Feb 9 14:15:08 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: 541106 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1421744imo; Wed, 9 Feb 2022 07:11:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyA3sJcBy6guGwMJUVmdxlreliEqdFiecg0F27wpvdZIJj5WyJfleq4A3IDUu7ISRBYnyS8 X-Received: by 2002:a05:6e02:15c4:: with SMTP id q4mr1260045ilu.281.1644419474093; Wed, 09 Feb 2022 07:11:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644419474; cv=none; d=google.com; s=arc-20160816; b=DnVzBQGfWIlDk6vJFumPC9d8P8tdwz5JElt7dv5xEqU8x9m1JUFWMC22Womvtc3PGG c64RddCZTP2mI95HPcjnQ/wNf+L00s3fX61nwTRyDXoAM6IJTJRTJb2mW9H6sjGcGGex zy9OSX9ZTXa2mOzNaAvQYgoX41rgOKqTafyOJ/OV64IWddrkLZy7VfwunXmwr2Ls7a9o GNL8yA6mwJKfmjmasgyKUuRVJpJcc9XJImXfoPgztZQhgOCB6DIBtc82uD9lYsNaj2JI DDNMRSPEViMcq8r2v1XEphVApDMqpnoPmNBB8trLkUMLyH3Z+04yWGmJE9bd2w1NmyuW t1tg== 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=kqkbAl6efy51OiBrv3WLzvOb75kYmitY6qJV4uBajjs=; b=Hw8+PryQvFNkMnIap3CQOpraAFM1FcMwfjrJfEAtDWcaXq8RqUbZaT9VEwmop0Sg5H Bs+KAB5uxisiBW1tDSWh5Duz+cFfTV6bv5XpQmeMMrVlcCtvlnLwGBRAeA+sF9cjtJQz 20G2b9VvGAFaX6aCY1geknmP3pDOZkqxxFM846ELYn8PuIhjwIWjLKMfhNTWqPETLLwD e65ynIRGFML8J4MDqL7guRMim12CX5TY7lFSdG2H4QDXDFueW8gmmV2zTwn4ADC2H7lI X5wFXB5LR2nVbT8f97uJLJm9vK19IHEUFM/iAQkK1QS23GpmroPF7US8bonYhDdu58Za SOGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pmeTUP26; 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 a5si7195624ilc.50.2022.02.09.07.11.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:11:14 -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=pmeTUP26; 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]:34538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHocj-0001Pq-Kc for patch@linaro.org; Wed, 09 Feb 2022 10:11:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030L-Bu for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::633] (port=43638 helo=mail-ej1-x633.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007rg-Ct for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:11 -0500 Received: by mail-ej1-x633.google.com with SMTP id d10so7669140eje.10 for ; Wed, 09 Feb 2022 06:15:43 -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=kqkbAl6efy51OiBrv3WLzvOb75kYmitY6qJV4uBajjs=; b=pmeTUP262jhh+2EMh3IhZRbzqPK3ruoBfspP7ShI7NcSTv8aUHlsMR/KqLFNkdCk8F Melc1UjRHVltSRCADCu5X3AWYG1GAyknSKJ94eyFQR//fd2RKJD1cS4lTpS5+rfqXl0h 9zWuCfpI1zErVTpXUO06R5Amfng3cgXoa42K0rj3d6axi+V5iQQMHYyu7MscbM3cQAIv j0wjHWW8hFWIIFiC8FZY6nz7yCsTc67+T5jEoQZXt2rPO5DrhNZAyGUZuJUm0xIQNyrv DTK+WRQ6grPkuxkYZqMBmCS8mhV8CpnKZ/IGDuZyMT6+U8GzekLhvywz3CqE8f2dxgaI XTXQ== 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=kqkbAl6efy51OiBrv3WLzvOb75kYmitY6qJV4uBajjs=; b=SnAq694lnav3ka+9wvIQ8ce6laGEmImwyOvVVGf+Q3CPQE6vhs8asO8Cyy3FqTUFCK jJFSM/0XBqiMicjOwfsGsG5UN8Ox+BgK8uezMf5QMM56rJycMA4eIY51/YYke4y73LB9 QWhvFIVJCjlrdP3WSeEhE4gTf4NyIkK6gbokmKEnrlkUd8Z8NU0Jd0ye2u7zVRK3fi/s 1TmaJ4Bx9FEkHpFV6jZIGdMZ5eB/auZyghR9Gx5h3xSRp5eOt2gPekZlvlVDb2FO8zol z8mOCG8KyPdDRxeZHvq9KQ86AjUTIE9TfEZIC78vkd716lMydUFXz5xV1XyiQ8POXRg9 3q6A== X-Gm-Message-State: AOAM533nNCrow5abvcv9NQzP8FKk10Vl0x/IlIAlBMhfwjv1MjuT21Tm vR7Hsk1nm6Kf8v6Oq2aMA2fZPw== X-Received: by 2002:a17:906:5d0e:: with SMTP id g14mr2194650ejt.211.1644416142918; Wed, 09 Feb 2022 06:15:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k13sm3365640ejz.167.2022.02.09.06.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CDDDB1FFBF; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/28] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Wed, 9 Feb 2022 14:15:08 +0000 Message-Id: <20220209141529.3418384-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::633 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.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, T_SCC_BODY_TEXT_LINE=-0.01 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 , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?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> Message-Id: <20220204204335.1689602-8-alex.bennee@linaro.org> 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 = [