From: Robert Foley <robert.foley@linaro.org>
To: qemu-devel@nongnu.org
Cc: philmd@redhat.com, alex.bennee@linaro.org,
robert.foley@linaro.org, peter.puhov@linaro.org
Subject: [PATCH v4 01/10] tests/vm: Fix issues in gen_cloud_init_iso
Date: Thu, 12 Mar 2020 10:27:19 -0400 [thread overview]
Message-ID: <20200312142728.12285-2-robert.foley@linaro.org> (raw)
In-Reply-To: <20200312142728.12285-1-robert.foley@linaro.org>
Fixed issue caused by dependencies on a later
set of patches that have not been merged yet.
Signed-off-by: Robert Foley <robert.foley@linaro.org>
---
tests/vm/basevm.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 8400b0e07f..db479a65fd 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -353,23 +353,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.rstrip(),
" - name: root\n",
" ssh-authorized-keys:\n",
- " - %s\n" % self._config['ssh_pub_key'],
+ " - %s\n" % SSH_PUB_KEY.rstrip(),
"locale: en_US.UTF-8\n"])
proxy = os.environ.get("http_proxy")
if not proxy is None:
--
2.17.1
next prev parent reply other threads:[~2020-03-12 14:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 14:27 [PATCH v4 00/10] tests/vm: Add support for aarch64 VMs Robert Foley
2020-03-12 14:27 ` Robert Foley [this message]
2020-03-12 14:27 ` [PATCH v4 02/10] tests/vm: Add configuration to basevm.py Robert Foley
2020-03-12 14:27 ` [PATCH v4 03/10] tests/vm: Added configuration file support Robert Foley
2020-03-12 14:27 ` [PATCH v4 04/10] tests/vm: add --boot-console switch Robert Foley
2020-05-11 9:13 ` Alex Bennée
2020-05-11 12:00 ` Robert Foley
2020-03-12 14:27 ` [PATCH v4 05/10] tests/vm: Add ability to select QEMU from current build Robert Foley
2020-03-12 14:27 ` [PATCH v4 06/10] tests/vm: allow wait_ssh() to specify command Robert Foley
2020-05-11 9:15 ` Alex Bennée
2020-03-12 14:27 ` [PATCH v4 07/10] tests/vm: Added a new script for ubuntu.aarch64 Robert Foley
2020-03-12 14:27 ` [PATCH v4 08/10] tests/vm: Added a new script for centos.aarch64 Robert Foley
2020-03-12 14:27 ` [PATCH v4 09/10] tests/vm: change scripts to use self._config Robert Foley
2020-03-12 14:27 ` [PATCH v4 10/10] tests/vm: Add workaround to consume console Robert Foley
2020-05-11 9:21 ` [PATCH v4 00/10] tests/vm: Add support for aarch64 VMs Alex Bennée
2020-05-11 12:11 ` Robert Foley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200312142728.12285-2-robert.foley@linaro.org \
--to=robert.foley@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=peter.puhov@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).