* [PATCH 0/4] tests/vm: minor install tweaks, update netbsd & freebsd
@ 2020-03-10 8:32 Gerd Hoffmann
2020-03-10 8:32 ` [PATCH 1/4] tests/vm: write raw console log Gerd Hoffmann
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2020-03-10 8:32 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Alex Bennée, Kamil Rytarowski,
Philippe Mathieu-Daudé, Gerd Hoffmann
Gerd Hoffmann (4):
tests/vm: write raw console log
tests/vm: move vga setup
tests/vm: update FreeBSD to 12.1
tests/vm: update NetBSD to 9.0
tests/vm/basevm.py | 7 ++++++-
tests/vm/fedora | 1 +
tests/vm/freebsd | 5 +++--
tests/vm/netbsd | 24 +++++++-----------------
tests/vm/openbsd | 1 +
tests/vm/ubuntu.i386 | 5 ++++-
6 files changed, 22 insertions(+), 21 deletions(-)
--
2.18.2
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/4] tests/vm: write raw console log 2020-03-10 8:32 [PATCH 0/4] tests/vm: minor install tweaks, update netbsd & freebsd Gerd Hoffmann @ 2020-03-10 8:32 ` Gerd Hoffmann 2020-03-10 8:48 ` Philippe Mathieu-Daudé 2020-03-16 14:16 ` Alex Bennée 2020-03-10 8:32 ` [PATCH 2/4] tests/vm: move vga setup Gerd Hoffmann ` (2 subsequent siblings) 3 siblings, 2 replies; 15+ messages in thread From: Gerd Hoffmann @ 2020-03-10 8:32 UTC (permalink / raw) To: qemu-devel Cc: Fam Zheng, Alex Bennée, Kamil Rytarowski, Philippe Mathieu-Daudé, Gerd Hoffmann Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/vm/basevm.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 8400b0e07f65..c53fd354d955 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -213,6 +213,9 @@ class BaseVM(object): def console_init(self, timeout = 120): vm = self._guest vm.console_socket.settimeout(timeout) + self.console_raw_path = os.path.join(vm._temp_dir, + vm._name + "-console.raw") + self.console_raw_file = open(self.console_raw_path, 'wb') def console_log(self, text): for line in re.split("[\r\n]", text): @@ -234,6 +237,9 @@ class BaseVM(object): while True: try: chars = vm.console_socket.recv(1) + if self.console_raw_file: + self.console_raw_file.write(chars) + self.console_raw_file.flush() except socket.timeout: sys.stderr.write("console: *** read timeout ***\n") sys.stderr.write("console: waiting for: '%s'\n" % expect) -- 2.18.2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/4] tests/vm: write raw console log 2020-03-10 8:32 ` [PATCH 1/4] tests/vm: write raw console log Gerd Hoffmann @ 2020-03-10 8:48 ` Philippe Mathieu-Daudé 2020-03-16 14:16 ` Alex Bennée 1 sibling, 0 replies; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2020-03-10 8:48 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel; +Cc: Fam Zheng, Kamil Rytarowski, Alex Bennée Hi Gerd, On 3/10/20 9:32 AM, Gerd Hoffmann wrote: > Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal > to watch the install console. Better to document that in the code/documentation rather than this commit description. Can you send a patch Alex can squash in? Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/vm/basevm.py | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 8400b0e07f65..c53fd354d955 100644 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -213,6 +213,9 @@ class BaseVM(object): > def console_init(self, timeout = 120): > vm = self._guest > vm.console_socket.settimeout(timeout) > + self.console_raw_path = os.path.join(vm._temp_dir, > + vm._name + "-console.raw") > + self.console_raw_file = open(self.console_raw_path, 'wb') > > def console_log(self, text): > for line in re.split("[\r\n]", text): > @@ -234,6 +237,9 @@ class BaseVM(object): > while True: > try: > chars = vm.console_socket.recv(1) > + if self.console_raw_file: > + self.console_raw_file.write(chars) > + self.console_raw_file.flush() > except socket.timeout: > sys.stderr.write("console: *** read timeout ***\n") > sys.stderr.write("console: waiting for: '%s'\n" % expect) > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/4] tests/vm: write raw console log 2020-03-10 8:32 ` [PATCH 1/4] tests/vm: write raw console log Gerd Hoffmann 2020-03-10 8:48 ` Philippe Mathieu-Daudé @ 2020-03-16 14:16 ` Alex Bennée 2020-03-16 14:22 ` Philippe Mathieu-Daudé 1 sibling, 1 reply; 15+ messages in thread From: Alex Bennée @ 2020-03-16 14:16 UTC (permalink / raw) To: Gerd Hoffmann Cc: Fam Zheng, Kamil Rytarowski, Philippe Mathieu-Daudé, qemu-devel Gerd Hoffmann <kraxel@redhat.com> writes: > Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal > to watch the install console. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> I suspect this is what's breaking "make check-acceptance" so I've dropped the series from testing/next for now. 2020-03-11 12:12:30,546 stacktrace L0039 ERROR| 2020-03-11 12:12:30,546 stacktrace L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\ ore/test.py:860 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| Traceback (most recent call last): 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ 1456, in test 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| self.error(self.exception) 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ 1064, in error 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| raise exceptions.TestError(message) 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last): 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 235, in load_module 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| return load_source(name, filename, file) 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 172, in load_source 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| module = _load(spec) 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 684, in _load 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 665, in _load_unlocked 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap_external>", line 678, in exec_module 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module> 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from avocado_qemu import Test 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module> 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.machine import QEMUMachine 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\ e 27, in <module> 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.console_socket import ConsoleSocket 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket' 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| 2020-03-11 12:12:30,547 stacktrace L0046 ERROR| 2020-03-11 12:12:30,548 test L0865 DEBUG| Local variables: 2020-03-11 12:12:30,561 test L0868 DEBUG| -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\ t_mips_malta_i6400_framebuffer_logo_1core > --- > tests/vm/basevm.py | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 8400b0e07f65..c53fd354d955 100644 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -213,6 +213,9 @@ class BaseVM(object): > def console_init(self, timeout = 120): > vm = self._guest > vm.console_socket.settimeout(timeout) > + self.console_raw_path = os.path.join(vm._temp_dir, > + vm._name + "-console.raw") > + self.console_raw_file = open(self.console_raw_path, 'wb') > > def console_log(self, text): > for line in re.split("[\r\n]", text): > @@ -234,6 +237,9 @@ class BaseVM(object): > while True: > try: > chars = vm.console_socket.recv(1) > + if self.console_raw_file: > + self.console_raw_file.write(chars) > + self.console_raw_file.flush() > except socket.timeout: > sys.stderr.write("console: *** read timeout ***\n") > sys.stderr.write("console: waiting for: '%s'\n" % expect) -- Alex Bennée ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/4] tests/vm: write raw console log 2020-03-16 14:16 ` Alex Bennée @ 2020-03-16 14:22 ` Philippe Mathieu-Daudé 2020-03-17 22:46 ` Cleber Rosa 0 siblings, 1 reply; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2020-03-16 14:22 UTC (permalink / raw) To: Alex Bennée, Gerd Hoffmann Cc: Fam Zheng, Eduardo Habkost, qemu-devel, Wainer dos Santos Moschetta, Kamil Rytarowski, Cleber Rosa On 3/16/20 3:16 PM, Alex Bennée wrote: > > Gerd Hoffmann <kraxel@redhat.com> writes: > >> Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal >> to watch the install console. >> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > I suspect this is what's breaking "make check-acceptance" so I've > dropped the series from testing/next for now. > > 2020-03-11 12:12:30,546 stacktrace L0039 ERROR| > 2020-03-11 12:12:30,546 stacktrace L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\ > ore/test.py:860 > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| Traceback (most recent call last): > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ > 1456, in test > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| self.error(self.exception) > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ > 1064, in error > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| raise exceptions.TestError(message) > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last): > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 235, in load_module > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| return load_source(name, filename, file) > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 172, in load_source > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| module = _load(spec) > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 684, in _load > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 665, in _load_unlocked > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap_external>", line 678, in exec_module > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from avocado_qemu import Test > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.machine import QEMUMachine > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\ > e 27, in <module> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.console_socket import ConsoleSocket > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket' Cc'ing Wainer/Cleber in case... > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| > 2020-03-11 12:12:30,547 stacktrace L0046 ERROR| > 2020-03-11 12:12:30,548 test L0865 DEBUG| Local variables: > 2020-03-11 12:12:30,561 test L0868 DEBUG| -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\ > t_mips_malta_i6400_framebuffer_logo_1core > > >> --- >> tests/vm/basevm.py | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py >> index 8400b0e07f65..c53fd354d955 100644 >> --- a/tests/vm/basevm.py >> +++ b/tests/vm/basevm.py >> @@ -213,6 +213,9 @@ class BaseVM(object): >> def console_init(self, timeout = 120): >> vm = self._guest >> vm.console_socket.settimeout(timeout) >> + self.console_raw_path = os.path.join(vm._temp_dir, >> + vm._name + "-console.raw") >> + self.console_raw_file = open(self.console_raw_path, 'wb') >> >> def console_log(self, text): >> for line in re.split("[\r\n]", text): >> @@ -234,6 +237,9 @@ class BaseVM(object): >> while True: >> try: >> chars = vm.console_socket.recv(1) >> + if self.console_raw_file: >> + self.console_raw_file.write(chars) >> + self.console_raw_file.flush() >> except socket.timeout: >> sys.stderr.write("console: *** read timeout ***\n") >> sys.stderr.write("console: waiting for: '%s'\n" % expect) > > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/4] tests/vm: write raw console log 2020-03-16 14:22 ` Philippe Mathieu-Daudé @ 2020-03-17 22:46 ` Cleber Rosa 2020-03-19 17:13 ` Alex Bennée 0 siblings, 1 reply; 15+ messages in thread From: Cleber Rosa @ 2020-03-17 22:46 UTC (permalink / raw) To: Philippe Mathieu-Daudé Cc: Fam Zheng, Eduardo Habkost, qemu-devel, Wainer dos Santos Moschetta, Kamil Rytarowski, Gerd Hoffmann, Alex Bennée [-- Attachment #1: Type: text/plain, Size: 5602 bytes --] On Mon, Mar 16, 2020 at 03:22:07PM +0100, Philippe Mathieu-Daudé wrote: > On 3/16/20 3:16 PM, Alex Bennée wrote: > > > > Gerd Hoffmann <kraxel@redhat.com> writes: > > > > > Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal > > > to watch the install console. > > > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > > > I suspect this is what's breaking "make check-acceptance" so I've > > dropped the series from testing/next for now. > > > > 2020-03-11 12:12:30,546 stacktrace L0039 ERROR| > > 2020-03-11 12:12:30,546 stacktrace L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\ > > ore/test.py:860 > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| Traceback (most recent call last): > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ > > 1456, in test > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| self.error(self.exception) > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ > > 1064, in error > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| raise exceptions.TestError(message) > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last): > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 235, in load_module > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| return load_source(name, filename, file) > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 172, in load_source > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| module = _load(spec) > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 684, in _load > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 665, in _load_unlocked > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap_external>", line 678, in exec_module > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module> > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from avocado_qemu import Test > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module> > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.machine import QEMUMachine > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\ > > e 27, in <module> > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.console_socket import ConsoleSocket > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket' > > Cc'ing Wainer/Cleber in case... > I've applied the "[PATCH v4 00/10] tests/vm: Add support for aarch64 VMs" series and this patch (on top of d649689a8) and could not replicate this issue with "make check-acceptance". Maybe I'm missing some other patch? - Cleber. > > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| > > 2020-03-11 12:12:30,547 stacktrace L0046 ERROR| > > 2020-03-11 12:12:30,548 test L0865 DEBUG| Local variables: > > 2020-03-11 12:12:30,561 test L0868 DEBUG| -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\ > > t_mips_malta_i6400_framebuffer_logo_1core > > > > > > > --- > > > tests/vm/basevm.py | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > > > index 8400b0e07f65..c53fd354d955 100644 > > > --- a/tests/vm/basevm.py > > > +++ b/tests/vm/basevm.py > > > @@ -213,6 +213,9 @@ class BaseVM(object): > > > def console_init(self, timeout = 120): > > > vm = self._guest > > > vm.console_socket.settimeout(timeout) > > > + self.console_raw_path = os.path.join(vm._temp_dir, > > > + vm._name + "-console.raw") > > > + self.console_raw_file = open(self.console_raw_path, 'wb') > > > def console_log(self, text): > > > for line in re.split("[\r\n]", text): > > > @@ -234,6 +237,9 @@ class BaseVM(object): > > > while True: > > > try: > > > chars = vm.console_socket.recv(1) > > > + if self.console_raw_file: > > > + self.console_raw_file.write(chars) > > > + self.console_raw_file.flush() > > > except socket.timeout: > > > sys.stderr.write("console: *** read timeout ***\n") > > > sys.stderr.write("console: waiting for: '%s'\n" % expect) > > > > > [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/4] tests/vm: write raw console log 2020-03-17 22:46 ` Cleber Rosa @ 2020-03-19 17:13 ` Alex Bennée 0 siblings, 0 replies; 15+ messages in thread From: Alex Bennée @ 2020-03-19 17:13 UTC (permalink / raw) To: Cleber Rosa Cc: Fam Zheng, Eduardo Habkost, qemu-devel, Wainer dos Santos Moschetta, Kamil Rytarowski, Gerd Hoffmann, Philippe Mathieu-Daudé Cleber Rosa <crosa@redhat.com> writes: > On Mon, Mar 16, 2020 at 03:22:07PM +0100, Philippe Mathieu-Daudé wrote: >> On 3/16/20 3:16 PM, Alex Bennée wrote: >> > >> > Gerd Hoffmann <kraxel@redhat.com> writes: >> > >> > > Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal >> > > to watch the install console. >> > > >> > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> >> > >> > I suspect this is what's breaking "make check-acceptance" so I've >> > dropped the series from testing/next for now. >> > >> > 2020-03-11 12:12:30,546 stacktrace L0039 ERROR| >> > 2020-03-11 12:12:30,546 stacktrace L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\ >> > ore/test.py:860 >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| Traceback (most recent call last): >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ >> > 1456, in test >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| self.error(self.exception) >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \ >> > 1064, in error >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| raise exceptions.TestError(message) >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last): >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 235, in load_module >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| return load_source(name, filename, file) >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/usr/lib/python3.6/imp.py", line 172, in load_source >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| module = _load(spec) >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 684, in _load >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 665, in _load_unlocked >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap_external>", line 678, in exec_module >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module> >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from avocado_qemu import Test >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module> >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.machine import QEMUMachine >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\ >> > e 27, in <module> >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| from qemu.console_socket import ConsoleSocket >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket' >> >> Cc'ing Wainer/Cleber in case... >> > > I've applied the "[PATCH v4 00/10] tests/vm: Add support for aarch64 > VMs" series and this patch (on top of d649689a8) and could not > replicate this issue with "make check-acceptance". > > Maybe I'm missing some other patch? > > - Cleber. > >> > 2020-03-11 12:12:30,547 stacktrace L0045 ERROR| >> > 2020-03-11 12:12:30,547 stacktrace L0046 ERROR| >> > 2020-03-11 12:12:30,548 test L0865 DEBUG| Local variables: >> > 2020-03-11 12:12:30,561 test L0868 DEBUG| -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\ >> > t_mips_malta_i6400_framebuffer_logo_1core >> > >> > >> > > --- >> > > tests/vm/basevm.py | 6 ++++++ >> > > 1 file changed, 6 insertions(+) >> > > >> > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py >> > > index 8400b0e07f65..c53fd354d955 100644 >> > > --- a/tests/vm/basevm.py >> > > +++ b/tests/vm/basevm.py >> > > @@ -213,6 +213,9 @@ class BaseVM(object): >> > > def console_init(self, timeout = 120): >> > > vm = self._guest >> > > vm.console_socket.settimeout(timeout) >> > > + self.console_raw_path = os.path.join(vm._temp_dir, >> > > + vm._name + "-console.raw") >> > > + self.console_raw_file = open(self.console_raw_path, 'wb') >> > > def console_log(self, text): >> > > for line in re.split("[\r\n]", text): >> > > @@ -234,6 +237,9 @@ class BaseVM(object): >> > > while True: >> > > try: >> > > chars = vm.console_socket.recv(1) >> > > + if self.console_raw_file: >> > > + self.console_raw_file.write(chars) >> > > + self.console_raw_file.flush() >> > > except socket.timeout: >> > > sys.stderr.write("console: *** read timeout ***\n") >> > > sys.stderr.write("console: waiting for: '%s'\n" % expect) Apologies - it looks like I got misled although I hope you'll forgive me because it wasn't clear from the backtrace. I've re-based and bisected and it turned out to be broken by: tests/acceptance: skip the mips_malta -smp tests on Travis These could potentially be MTTCG failures which are exacerbated by the reduced number of cores on Travis. Additionally the 1 core test started failing while I was re-basing the series. However the error message is inconsistent on the various systems I run on. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> 1 file changed, 6 insertions(+) tests/acceptance/machine_mips_malta.py | 6 ++++++ modified tests/acceptance/machine_mips_malta.py @@ -91,6 +91,8 @@ class MaltaMachineFramebuffer(Test): cv2.imwrite(debug_png, screendump_bgr) self.assertGreaterEqual(tuxlogo_count, cpu_cores_count) + # FIXME: this seems to be failing due to some sort of import error + @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') def test_mips_malta_i6400_framebuffer_logo_1core(self): """ :avocado: tags=arch:mips64el @@ -99,6 +101,9 @@ class MaltaMachineFramebuffer(Test): """ self.do_test_i6400_framebuffer_logo(1) + # FIXME: There seems to be an MTTCG related bug that shows up more + # on Travis due to the ease of hitting a race with less cores. + @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') def test_mips_malta_i6400_framebuffer_logo_7cores(self): """ :avocado: tags=arch:mips64el @@ -108,6 +113,7 @@ class MaltaMachineFramebuffer(Test): """ self.do_test_i6400_framebuffer_logo(7) + @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') def test_mips_malta_i6400_framebuffer_logo_8cores(self): """ :avocado: tags=arch:mips64el Which I had earlier in the patch series as it was failing on Travis. I'll trigger another Travis run and see if I can drop them. -- Alex Bennée ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/4] tests/vm: move vga setup 2020-03-10 8:32 [PATCH 0/4] tests/vm: minor install tweaks, update netbsd & freebsd Gerd Hoffmann 2020-03-10 8:32 ` [PATCH 1/4] tests/vm: write raw console log Gerd Hoffmann @ 2020-03-10 8:32 ` Gerd Hoffmann 2020-03-10 8:46 ` Philippe Mathieu-Daudé 2020-03-10 8:32 ` [PATCH 3/4] tests/vm: update FreeBSD to 12.1 Gerd Hoffmann 2020-03-10 8:32 ` [PATCH 4/4] tests/vm: update NetBSD to 9.0 Gerd Hoffmann 3 siblings, 1 reply; 15+ messages in thread From: Gerd Hoffmann @ 2020-03-10 8:32 UTC (permalink / raw) To: qemu-devel Cc: Fam Zheng, Alex Bennée, Kamil Rytarowski, Philippe Mathieu-Daudé, Gerd Hoffmann Move '-device VGA' from basevm.py to the guests, so they have the chance to opt out and run without display device. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/vm/basevm.py | 1 - tests/vm/fedora | 1 + tests/vm/freebsd | 1 + tests/vm/netbsd | 1 + tests/vm/openbsd | 1 + tests/vm/ubuntu.i386 | 5 ++++- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index c53fd354d955..cffe7c4600ed 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -179,7 +179,6 @@ class BaseVM(object): def boot(self, img, extra_args=[]): args = self._args + [ - "-device", "VGA", "-drive", "file=%s,if=none,id=drive0,cache=writeback" % img, "-device", "virtio-blk,drive=drive0,bootindex=0"] args += self._data_args + extra_args diff --git a/tests/vm/fedora b/tests/vm/fedora index 4843b4175e07..bd9c6cf295c1 100755 --- a/tests/vm/fedora +++ b/tests/vm/fedora @@ -82,6 +82,7 @@ class FedoraVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init(300) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 86770878b67b..58166766d915 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -92,6 +92,7 @@ class FreeBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 55590f460152..f3257bc245a3 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -86,6 +86,7 @@ class NetBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/openbsd b/tests/vm/openbsd index ab6abbedab57..0b705f494527 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -82,6 +82,7 @@ class OpenBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 3266038fbde5..157077533532 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -36,7 +36,10 @@ class UbuntuX86VM(basevm.BaseVM): img_tmp = img + ".tmp" subprocess.check_call(["cp", "-f", cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) + self.boot(img_tmp, extra_args = [ + "-device", "VGA", + "-cdrom", self.gen_cloud_init_iso() + ]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("apt-get update") -- 2.18.2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/4] tests/vm: move vga setup 2020-03-10 8:32 ` [PATCH 2/4] tests/vm: move vga setup Gerd Hoffmann @ 2020-03-10 8:46 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 15+ messages in thread From: Philippe Mathieu-Daudé @ 2020-03-10 8:46 UTC (permalink / raw) To: Gerd Hoffmann, qemu-devel; +Cc: Fam Zheng, Kamil Rytarowski, Alex Bennée On 3/10/20 9:32 AM, Gerd Hoffmann wrote: > Move '-device VGA' from basevm.py to the guests, so they have > the chance to opt out and run without display device. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/vm/basevm.py | 1 - > tests/vm/fedora | 1 + > tests/vm/freebsd | 1 + > tests/vm/netbsd | 1 + > tests/vm/openbsd | 1 + > tests/vm/ubuntu.i386 | 5 ++++- > 6 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index c53fd354d955..cffe7c4600ed 100644 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -179,7 +179,6 @@ class BaseVM(object): > > def boot(self, img, extra_args=[]): > args = self._args + [ > - "-device", "VGA", > "-drive", "file=%s,if=none,id=drive0,cache=writeback" % img, > "-device", "virtio-blk,drive=drive0,bootindex=0"] > args += self._data_args + extra_args > diff --git a/tests/vm/fedora b/tests/vm/fedora > index 4843b4175e07..bd9c6cf295c1 100755 > --- a/tests/vm/fedora > +++ b/tests/vm/fedora > @@ -82,6 +82,7 @@ class FedoraVM(basevm.BaseVM): > self.boot(img_tmp, extra_args = [ > "-bios", "pc-bios/bios-256k.bin", > "-machine", "graphics=off", > + "-device", "VGA", > "-cdrom", iso > ]) > self.console_init(300) > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > index 86770878b67b..58166766d915 100755 > --- a/tests/vm/freebsd > +++ b/tests/vm/freebsd > @@ -92,6 +92,7 @@ class FreeBSDVM(basevm.BaseVM): > self.boot(img_tmp, extra_args = [ > "-bios", "pc-bios/bios-256k.bin", > "-machine", "graphics=off", > + "-device", "VGA", > "-cdrom", iso > ]) > self.console_init() > diff --git a/tests/vm/netbsd b/tests/vm/netbsd > index 55590f460152..f3257bc245a3 100755 > --- a/tests/vm/netbsd > +++ b/tests/vm/netbsd > @@ -86,6 +86,7 @@ class NetBSDVM(basevm.BaseVM): > self.boot(img_tmp, extra_args = [ > "-bios", "pc-bios/bios-256k.bin", > "-machine", "graphics=off", > + "-device", "VGA", > "-cdrom", iso > ]) > self.console_init() > diff --git a/tests/vm/openbsd b/tests/vm/openbsd > index ab6abbedab57..0b705f494527 100755 > --- a/tests/vm/openbsd > +++ b/tests/vm/openbsd > @@ -82,6 +82,7 @@ class OpenBSDVM(basevm.BaseVM): > self.boot(img_tmp, extra_args = [ > "-bios", "pc-bios/bios-256k.bin", > "-machine", "graphics=off", > + "-device", "VGA", > "-cdrom", iso > ]) > self.console_init() > diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 > index 3266038fbde5..157077533532 100755 > --- a/tests/vm/ubuntu.i386 > +++ b/tests/vm/ubuntu.i386 > @@ -36,7 +36,10 @@ class UbuntuX86VM(basevm.BaseVM): > img_tmp = img + ".tmp" > subprocess.check_call(["cp", "-f", cimg, img_tmp]) > self.exec_qemu_img("resize", img_tmp, "50G") > - self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) > + self.boot(img_tmp, extra_args = [ > + "-device", "VGA", > + "-cdrom", self.gen_cloud_init_iso() > + ]) > self.wait_ssh() > self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") > self.ssh_root_check("apt-get update") > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/4] tests/vm: update FreeBSD to 12.1 2020-03-10 8:32 [PATCH 0/4] tests/vm: minor install tweaks, update netbsd & freebsd Gerd Hoffmann 2020-03-10 8:32 ` [PATCH 1/4] tests/vm: write raw console log Gerd Hoffmann 2020-03-10 8:32 ` [PATCH 2/4] tests/vm: move vga setup Gerd Hoffmann @ 2020-03-10 8:32 ` Gerd Hoffmann 2020-03-10 10:38 ` Alex Bennée 2020-03-10 8:32 ` [PATCH 4/4] tests/vm: update NetBSD to 9.0 Gerd Hoffmann 3 siblings, 1 reply; 15+ messages in thread From: Gerd Hoffmann @ 2020-03-10 8:32 UTC (permalink / raw) To: qemu-devel Cc: Fam Zheng, Alex Bennée, Kamil Rytarowski, Philippe Mathieu-Daudé, Gerd Hoffmann Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/vm/freebsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 58166766d915..298967fe9cf4 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -24,8 +24,8 @@ class FreeBSDVM(basevm.BaseVM): name = "freebsd" arch = "x86_64" - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz" - csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db" + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz" + csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88" size = "20G" pkgs = [ # build tools -- 2.18.2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1 2020-03-10 8:32 ` [PATCH 3/4] tests/vm: update FreeBSD to 12.1 Gerd Hoffmann @ 2020-03-10 10:38 ` Alex Bennée 2020-03-10 12:02 ` Gerd Hoffmann 0 siblings, 1 reply; 15+ messages in thread From: Alex Bennée @ 2020-03-10 10:38 UTC (permalink / raw) To: Gerd Hoffmann Cc: Fam Zheng, Kamil Rytarowski, Philippe Mathieu-Daudé, qemu-devel Gerd Hoffmann <kraxel@redhat.com> writes: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/vm/freebsd | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > index 58166766d915..298967fe9cf4 100755 > --- a/tests/vm/freebsd > +++ b/tests/vm/freebsd > @@ -24,8 +24,8 @@ class FreeBSDVM(basevm.BaseVM): > name = "freebsd" > arch = "x86_64" > > - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz" > - csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db" > + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz" > + csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88" > size = "20G" > pkgs = [ > # build tools Hmm I'm seeing a failure during running which I had to manually override: DEBUG:root:ssh_cmd: ssh -t -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=1 -p 39533 -i /home/alex.bennee/lsrc/qemu.git/builds/all/vm-test-_dqalech.tmp/id_rsa -o SendEnv=https_proxy -o SendEnv=http_proxy -o SendEnv=ftp_proxy -o SendEnv=no_proxy root@127.0.0.1 pkg install -y git pkgconf bzip2 python37 bash gmake gsed flex bison gnutls jpeg-turbo png sdl2 gtk3 libxkbcommon libepoxy mesa-libs zstd Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. Bootstrapping pkg from pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... Verifying signature with trusted certificate pkg.freebsd.org.2013102301... done Installing pkg-1.12.0_1... Newer FreeBSD version for package pkg: To ignore this error set IGNORE_OSVERSION=yes - package: 1201000 - running kernel: 1200086 Ignore the mismatch and continue? [Y/n]: Extracting pkg-1.12.0_1: 100% -- Alex Bennée ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1 2020-03-10 10:38 ` Alex Bennée @ 2020-03-10 12:02 ` Gerd Hoffmann 2020-03-10 12:18 ` Alex Bennée 0 siblings, 1 reply; 15+ messages in thread From: Gerd Hoffmann @ 2020-03-10 12:02 UTC (permalink / raw) To: Alex Bennée Cc: Fam Zheng, Kamil Rytarowski, Philippe Mathieu-Daudé, qemu-devel > > - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz" > > - csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db" > > + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz" > > + csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88" > Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. > Bootstrapping pkg from > pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... > Verifying signature with trusted certificate > pkg.freebsd.org.2013102301... done > Installing pkg-1.12.0_1... > Newer FreeBSD version for package pkg: > To ignore this error set IGNORE_OSVERSION=yes > - package: 1201000 ^^^^ 12.1 package > - running kernel: 1200086 ^^^^ 12.0 running I saw that too, but only *without* the patch. The upgrade to 12.1 fixes that. We might consider setting IGNORE_OSVERSION=yes, so this doesn't happen again after FreeBSD 12.2 release. Not sure whenever that can have unwanted side effects though, like packages not working properly. Any advise from the bsd guys? cheers, Gerd ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1 2020-03-10 12:02 ` Gerd Hoffmann @ 2020-03-10 12:18 ` Alex Bennée 2020-03-10 13:40 ` Alex Bennée 0 siblings, 1 reply; 15+ messages in thread From: Alex Bennée @ 2020-03-10 12:18 UTC (permalink / raw) To: Gerd Hoffmann Cc: Fam Zheng, Kamil Rytarowski, Philippe Mathieu-Daudé, qemu-devel Gerd Hoffmann <kraxel@redhat.com> writes: >> > - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz" >> > - csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db" >> > + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz" >> > + csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88" > >> Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. >> Bootstrapping pkg from >> pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... >> Verifying signature with trusted certificate >> pkg.freebsd.org.2013102301... done >> Installing pkg-1.12.0_1... >> Newer FreeBSD version for package pkg: >> To ignore this error set IGNORE_OSVERSION=yes >> - package: 1201000 > ^^^^ > 12.1 package > >> - running kernel: 1200086 > ^^^^ > 12.0 running > > I saw that too, but only *without* the patch. The upgrade to 12.1 fixes > that. Hmm I wonder if the cached assets got confused? It certainly re-ran the install rather than skipping straight to running the test. > We might consider setting IGNORE_OSVERSION=yes, so this doesn't happen > again after FreeBSD 12.2 release. Not sure whenever that can have > unwanted side effects though, like packages not working properly. > > Any advise from the bsd guys? > > cheers, > Gerd -- Alex Bennée ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1 2020-03-10 12:18 ` Alex Bennée @ 2020-03-10 13:40 ` Alex Bennée 0 siblings, 0 replies; 15+ messages in thread From: Alex Bennée @ 2020-03-10 13:40 UTC (permalink / raw) To: Gerd Hoffmann Cc: Fam Zheng, Kamil Rytarowski, Philippe Mathieu-Daudé, qemu-devel Alex Bennée <alex.bennee@linaro.org> writes: > Gerd Hoffmann <kraxel@redhat.com> writes: > >>> > - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz" >>> > - csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db" >>> > + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz" >>> > + csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88" >> >>> Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. >>> Bootstrapping pkg from >>> pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... >>> Verifying signature with trusted certificate >>> pkg.freebsd.org.2013102301... done >>> Installing pkg-1.12.0_1... >>> Newer FreeBSD version for package pkg: >>> To ignore this error set IGNORE_OSVERSION=yes >>> - package: 1201000 >> ^^^^ >> 12.1 package >> >>> - running kernel: 1200086 >> ^^^^ >> 12.0 running >> >> I saw that too, but only *without* the patch. The upgrade to 12.1 fixes >> that. > > Hmm I wonder if the cached assets got confused? It certainly re-ran the > install rather than skipping straight to running the test. OK I'm an idiot... I hadn't correctly updated the branch on my test machine: git fetch origin; and git checkout testing/next; and git reset --hard github/testing/next vs git fetch github; and git checkout testing/next; and git reset --hard github/testing/next > >> We might consider setting IGNORE_OSVERSION=yes, so this doesn't happen >> again after FreeBSD 12.2 release. Not sure whenever that can have >> unwanted side effects though, like packages not working properly. >> >> Any advise from the bsd guys? >> >> cheers, >> Gerd -- Alex Bennée ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 4/4] tests/vm: update NetBSD to 9.0 2020-03-10 8:32 [PATCH 0/4] tests/vm: minor install tweaks, update netbsd & freebsd Gerd Hoffmann ` (2 preceding siblings ...) 2020-03-10 8:32 ` [PATCH 3/4] tests/vm: update FreeBSD to 12.1 Gerd Hoffmann @ 2020-03-10 8:32 ` Gerd Hoffmann 3 siblings, 0 replies; 15+ messages in thread From: Gerd Hoffmann @ 2020-03-10 8:32 UTC (permalink / raw) To: qemu-devel Cc: Fam Zheng, Alex Bennée, Kamil Rytarowski, Philippe Mathieu-Daudé, Gerd Hoffmann The installer supports GPT now, so the install workflow has changed a bit. Also: run without VGA device. This works around a bug in the seabios sercon code and makes the bootloader menu show up on the serial line, so we can drop the quirk for that. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- tests/vm/netbsd | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index f3257bc245a3..b10c9d429ded 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -22,8 +22,8 @@ class NetBSDVM(basevm.BaseVM): name = "netbsd" arch = "x86_64" - link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8.1-amd64.iso" - csum = "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd63687898c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f" + link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0/images/NetBSD-9.0-amd64.iso" + csum = "34da4882ee61bdbf69f241195a8933dc800949d30b43fc6988da853d57fc2b8cac50cf97a0d2adaf93250b4e329d189c1a8b83c33bd515226f37745d50c33369" size = "20G" pkgs = [ # tools @@ -86,42 +86,31 @@ class NetBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", - "-device", "VGA", "-cdrom", iso ]) self.console_init() - self.console_wait("Primary Bootstrap") - - # serial console boot menu output doesn't work for some - # reason, so we have to fly blind ... - for char in list("5consdev com0\n"): - time.sleep(0.2) - self.console_send(char) - self.console_consume() + self.console_wait_send("3. Drop to boot prompt", "3") + self.console_wait_send("> ", "consdev com0\n") self.console_wait_send("> ", "boot\n") self.console_wait_send("Terminal type", "xterm\n") self.console_wait_send("a: Installation messages", "a\n") - self.console_wait_send("b: US-English", "b\n") self.console_wait_send("a: Install NetBSD", "a\n") self.console_wait("Shall we continue?") self.console_wait_send("b: Yes", "b\n") self.console_wait_send("a: ld0", "a\n") + self.console_wait_send("a: Guid Partition Table", "a\n") self.console_wait_send("a: This is the correct", "a\n") - self.console_wait_send("b: Use the entire disk", "b\n") - self.console_wait("NetBSD bootcode") - self.console_wait_send("a: Yes", "a\n") - self.console_wait_send("b: Use existing part", "b\n") + self.console_wait_send("b: Use default part", "b\n") self.console_wait_send("x: Partition sizes ok", "x\n") - self.console_wait_send("for your NetBSD disk", "\n") self.console_wait("Shall we continue?") self.console_wait_send("b: Yes", "b\n") self.console_wait_send("b: Use serial port com0", "b\n") self.console_wait_send("f: Set serial baud rate", "f\n") self.console_wait_send("a: 9600", "a\n") - self.console_wait_send("x: Exit", "x\n") + self.console_wait_send("x: Continue", "x\n") self.console_wait_send("a: Full installation", "a\n") self.console_wait_send("a: CD-ROM", "a\n") -- 2.18.2 ^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-03-19 17:14 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-03-10 8:32 [PATCH 0/4] tests/vm: minor install tweaks, update netbsd & freebsd Gerd Hoffmann 2020-03-10 8:32 ` [PATCH 1/4] tests/vm: write raw console log Gerd Hoffmann 2020-03-10 8:48 ` Philippe Mathieu-Daudé 2020-03-16 14:16 ` Alex Bennée 2020-03-16 14:22 ` Philippe Mathieu-Daudé 2020-03-17 22:46 ` Cleber Rosa 2020-03-19 17:13 ` Alex Bennée 2020-03-10 8:32 ` [PATCH 2/4] tests/vm: move vga setup Gerd Hoffmann 2020-03-10 8:46 ` Philippe Mathieu-Daudé 2020-03-10 8:32 ` [PATCH 3/4] tests/vm: update FreeBSD to 12.1 Gerd Hoffmann 2020-03-10 10:38 ` Alex Bennée 2020-03-10 12:02 ` Gerd Hoffmann 2020-03-10 12:18 ` Alex Bennée 2020-03-10 13:40 ` Alex Bennée 2020-03-10 8:32 ` [PATCH 4/4] tests/vm: update NetBSD to 9.0 Gerd Hoffmann
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).