On Fri, 12 Jan 2024 at 11:11, Alex Bennée <[email protected]> wrote: > > This reverts commit c2ef5ee89d76f0ab77c4dd6a1c9eeed4d35d20ed. > > While the fixes for #2010 and #2013 have improved things locally it > seems GitLab still continues to be flaky. > > Signed-off-by: Alex Bennée <[email protected]> > > diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py > index 6fdcbd6ac3d..1eaa36444cb 100644 > --- a/tests/avocado/replay_kernel.py > +++ b/tests/avocado/replay_kernel.py > @@ -98,10 +98,13 @@ def test_i386_pc(self): > > self.run_rr(kernel_path, kernel_command_line, console_pattern, > shift=5) > > + # See https://gitlab.com/qemu-project/qemu/-/issues/2010 > + @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test sometimes gets > stuck') > def test_x86_64_pc(self): > """ > :avocado: tags=arch:x86_64 > :avocado: tags=machine:pc > + :avocado: tags=flaky > """ > kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' > > '/linux/releases/29/Everything/x86_64/os/images/pxeboot' > @@ -132,6 +135,8 @@ def test_mips_malta(self): > > self.run_rr(kernel_path, kernel_command_line, console_pattern, > shift=5) > > + # See https://gitlab.com/qemu-project/qemu/-/issues/2013 > + @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on > GitLab') > def test_mips64el_malta(self): > """ > This test requires the ar tool to extract "data.tar.gz" from
These gitlab issues are both currently closed -- if we think the problem is still present and are re-introducing the skip lines, we should re-open the issues, I think. thanks -- PMM
