From patchwork Fri Mar 27 18:13:14 2020 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: 185014 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1611912ilr; Fri, 27 Mar 2020 11:17:16 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvKSfmyq9thwT1vABXVS96HB2n593snruj3bgq9q9iaOdAyxsN32IDo71QCCsVpsT66AoWo X-Received: by 2002:a0c:d601:: with SMTP id c1mr547005qvj.164.1585333036164; Fri, 27 Mar 2020 11:17:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333036; cv=none; d=google.com; s=arc-20160816; b=eyV0wVAc+xlPU5qdA8Twit/2dLDQrAVWQJA/9QIQ9fEzlbN9vU169iaxkw3upGJi16 QHSZ239ofaDHPcKdsqbNcdCKKEbB5nGCwyd20oHT7kyGXdEqPWRGJr7liA9IpBwfavAo 5ux95VP8x7j6cZ6RVG3ByvlCMCDabF4H+p8Y1Ls0hsm/F5BGfy3491uRyDNOqqcYepHs dX0WcCoeGyjnocalizyooVjkS+tUBEStOc11xQsRDwvIFFWCunNE0WHea3+OPu7fpH69 uVM/0gYpvBFdL5A/MjcHxNHOpwD5QJg2kC60p02qV0YG4VLvgYpz7jcq/XJe3en4//hQ gg9g== 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=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=c5pns3n5psRsAuFiFC0HDTuxD0A2N657GKZDHMz73tEmEJ7PXUQEtHn3Wz0/9dKYlv 2vqTx2amIebLo9hu+7VB1SgasqaHV/0cmR0U8VoURcHGdE+q/Hp7hZa76la8QsQ0dSyJ iAAFH/yz/TwjPub0NoySLwhHFX/+yOMGcc11RrvIPczV/eqGw8+YaRG+cUJdlH7S0Cro dASSp/8xqM78n/QqnLNkriHMwW26qBZ8qDUqJzy8ORTHjl+GfTrBogSAKO72UAFnA7bi uiLMXZ5FJ1Qw6cw9ec4+bQBM5IMFkbrSKP0NIrMeAs/S3XKNu+XYgFt0TTE72vuK/mOw C9Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U6cSY60O; 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 i12si3923210qkk.217.2020.03.27.11.17.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:17:16 -0700 (PDT) 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=U6cSY60O; 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]:45356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtXf-0007vw-HG for patch@linaro.org; Fri, 27 Mar 2020 14:17:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40513) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtU5-0001wh-3m for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU3-0000nP-QR for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:32 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:53886) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU3-0000mk-KR for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:31 -0400 Received: by mail-wm1-x330.google.com with SMTP id b12so12404407wmj.3 for ; Fri, 27 Mar 2020 11:13:31 -0700 (PDT) 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=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=U6cSY60OvvSW+ZuiJYUQU7R9lac4nTOUAZZmelcA/r2coyS1rQ8G3XOUlFXI2twgOC RQ4IgVtl5G6ZAV2XH5sLFohSBHIQrS/sX+mNs1mS1SO0uXgHmQcI4aRr+m//b58HhOAD ZXwHD85x8NEdyULRQnPY2kIb8XmazrZ8QMHbZ+3x3j72XRCa5do6BxgybHEcnMj5LIXV JJz72Lu1/0Mf5551sfkB/cQrzv6D5SNs71Wx7nA3TCBVy4riqrs/ez4a4+hyvOvkWTmB NRQKfpd7txNFxd9e5n9eZj/kukz4+I4wJLgpJS8xs65734oosGWEEwG/ViX3CjpUeQ+L 52xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=NmYDr4LPgcdzTsbRaylZZfdrFmaXxgJguJheld0mr+qb3CmOye5FdybCvL7gVOfUvu q1u0ei2/1NcjFMVF8wDKaJMHy1+jLWKzyCvSaquwEdPAYynM/iPvL/jyFbDba7QTBrwr seC+bAoBcSu3db1o4VR1yxTprsjHxNzlAiozrLgsz8r3XzMnktjLRh6hg7GkGEjdkhvh Bok1/bfl4KOaF2ZQN7yNqJ66WB5kOpvcssvmuT9dJgnounhVIBAu+37zw/tCyOu8TAgA PVvwvqLDJCxM+Hd9Pb6ofILgMKsdhsEJMga/I/QiKFm5B/HeAbizY16hUaoNPcO6j+e3 nqhg== X-Gm-Message-State: ANhLgQ25Vb5CgaJUE47QMhxg7konMvF4pJ/b7oocYVX0FPJb8PTUJHrs saf3MmgPwiZ5iEwz6WiIQ+ESoA== X-Received: by 2002:a7b:cf09:: with SMTP id l9mr970618wmg.11.1585332810461; Fri, 27 Mar 2020 11:13:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 5sm6018729wrs.20.2020.03.27.11.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D046E1FF92; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 06/12] tests/vm: fix basevm config Date: Fri, 27 Mar 2020 18:13:14 +0000 Message-Id: <20200327181320.23329-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When the patch was merged it was part of a longer series which had already merged the config changes. Semu-revert the config related changes for now so things will build. Fixes: b081986c85fd2 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200323161514.23952-6-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index cffe7c4600e..756ccf7acae 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -358,23 +358,23 @@ class BaseVM(object): "local-hostname: {}-guest\n".format(name)]) mdata.close() udata = open(os.path.join(cidir, "user-data"), "w") - print("guest user:pw {}:{}".format(self._config['guest_user'], - self._config['guest_pass'])) + print("guest user:pw {}:{}".format(self.GUEST_USER, + self.GUEST_PASS)) udata.writelines(["#cloud-config\n", "chpasswd:\n", " list: |\n", - " root:%s\n" % self._config['root_pass'], - " %s:%s\n" % (self._config['guest_user'], - self._config['guest_pass']), + " root:%s\n" % self.ROOT_PASS, + " %s:%s\n" % (self.GUEST_USER, + self.GUEST_PASS), " expire: False\n", "users:\n", - " - name: %s\n" % self._config['guest_user'], + " - name: %s\n" % self.GUEST_USER, " sudo: ALL=(ALL) NOPASSWD:ALL\n", " ssh-authorized-keys:\n", - " - %s\n" % self._config['ssh_pub_key'], + " - %s\n" % SSH_PUB_KEY, " - name: root\n", " ssh-authorized-keys:\n", - " - %s\n" % self._config['ssh_pub_key'], + " - %s\n" % SSH_PUB_KEY, "locale: en_US.UTF-8\n"]) proxy = os.environ.get("http_proxy") if not proxy is None: