[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 06/12] tests/vm: fix basevm config
From: |
Alex Bennée |
Subject: |
[PULL v2 06/12] tests/vm: fix basevm config |
Date: |
Fri, 27 Mar 2020 18:13:14 +0000 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
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:
--
2.20.1
- [PULL v2 for 5.0 00/12] testing updates (+ one mttcg change), Alex Bennée, 2020/03/27
- [PULL v2 01/12] qemu/atomic.h: add #ifdef guards for stdatomic.h, Alex Bennée, 2020/03/27
- [PULL v2 03/12] tests/vm: move vga setup, Alex Bennée, 2020/03/27
- [PULL v2 02/12] tests/vm: write raw console log, Alex Bennée, 2020/03/27
- [PULL v2 04/12] tests/vm: update FreeBSD to 12.1, Alex Bennée, 2020/03/27
- [PULL v2 05/12] tests/vm: update NetBSD to 9.0, Alex Bennée, 2020/03/27
- [PULL v2 07/12] configure: disable MTTCG for MIPS guests, Alex Bennée, 2020/03/27
- [PULL v2 09/12] tests/docker: Install gcrypt devel package in Debian image, Alex Bennée, 2020/03/27
- [PULL v2 06/12] tests/vm: fix basevm config,
Alex Bennée <=
- [PULL v2 08/12] tests/docker: Keep package list sorted, Alex Bennée, 2020/03/27
- [PULL v2 10/12] tests/docker: Use Python3 PyYAML in the Fedora image, Alex Bennée, 2020/03/27
- [PULL v2 12/12] .travis.yml: Add a KVM-only s390x job, Alex Bennée, 2020/03/27
- [PULL v2 11/12] tests/docker: Add libepoxy and libudev packages to the Fedora image, Alex Bennée, 2020/03/27
- Re: [PULL v2 for 5.0 00/12] testing updates (+ one mttcg change), Peter Maydell, 2020/03/27