From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Beraldo Leal" <bleal@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Willian Rampazzo" <wrampazz@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [PULL 8/9] Acceptance Tests: fix population of public key in cloudinit image
Date: Mon, 15 Feb 2021 23:57:04 -0500 [thread overview]
Message-ID: <20210216045705.9590-9-crosa@redhat.com> (raw)
In-Reply-To: <20210216045705.9590-1-crosa@redhat.com>
Currently the path of the ssh public key is being set, but its
content is obviously what's needed.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20210203172357.1422425-18-crosa@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 687c5dc0cf6..51e9055c986 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -290,13 +290,15 @@ def prepare_cloudinit(self, ssh_pubkey=None):
try:
cloudinit_iso = os.path.join(self.workdir, 'cloudinit.iso')
self.phone_home_port = network.find_free_port()
+ with open(ssh_pubkey) as pubkey:
+ pubkey_content = pubkey.read()
cloudinit.iso(cloudinit_iso, self.name,
username='root',
password='password',
# QEMU's hard coded usermode router address
phone_home_host='10.0.2.2',
phone_home_port=self.phone_home_port,
- authorized_key=ssh_pubkey)
+ authorized_key=pubkey_content)
except Exception:
self.cancel('Failed to prepare the cloudinit image')
return cloudinit_iso
--
2.26.2
next prev parent reply other threads:[~2021-02-16 5:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 4:56 [PULL 0/9] Acceptance Tests and Python libs patches for 2021-02-15 Cleber Rosa
2021-02-16 4:56 ` [PULL 1/9] Acceptance Tests: bump Avocado version requirement to 85.0 Cleber Rosa
2021-02-16 4:56 ` [PULL 2/9] virtiofs_submounts.py test: Note on vmlinuz param Cleber Rosa
2021-02-16 4:56 ` [PULL 3/9] Python: close the log file kept by QEMUMachine before reading it Cleber Rosa
2021-02-16 4:57 ` [PULL 4/9] tests/acceptance/virtio-gpu.py: preserve virtio-user-gpu log Cleber Rosa
2021-02-16 4:57 ` [PULL 5/9] maint: Tell git that *.py files should use python diff hunks Cleber Rosa
2021-02-16 4:57 ` [PULL 6/9] Acceptance Tests: introduce LinuxTest base class Cleber Rosa
2021-02-16 4:57 ` [PULL 7/9] Acceptance Tests: introduce method for requiring an accelerator Cleber Rosa
2021-02-16 4:57 ` Cleber Rosa [this message]
2021-02-16 4:57 ` [PULL 9/9] Acceptance Tests: set up existing ssh keys by default Cleber Rosa
2021-02-16 16:46 ` [PULL 0/9] Acceptance Tests and Python libs patches for 2021-02-15 Peter Maydell
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=20210216045705.9590-9-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=bleal@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
--cc=wrampazz@redhat.com \
/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).