diff mbox series

tests/acceptance: Reduce quanta-gsj U-boot+Linux test time

Message ID 20200918142344.150749-1-f4bug@amsat.org
State New
Headers show
Series tests/acceptance: Reduce quanta-gsj U-boot+Linux test time | expand

Commit Message

Philippe Mathieu-Daudé Sept. 18, 2020, 2:23 p.m. UTC
The 'arm_quanta_gsj_initrd' test is timeouting on GitLab CI:
https://gitlab.com/philmd/qemu/-/jobs/745483978#L846

Use the same trick from the 'arm_quanta_gsj' test to reduce the
systemd services started and get quicker to the shell prompt.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/acceptance/boot_linux_console.py | 3 +++
 1 file changed, 3 insertions(+)

Comments

no-reply@patchew.org Sept. 18, 2020, 2:27 p.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/20200918142344.150749-1-f4bug@amsat.org/



Hi,

This series failed build test on FreeBSD host. Please find the details below.






The full log is available at
http://patchew.org/logs/20200918142344.150749-1-f4bug@amsat.org/testing.FreeBSD/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Philippe Mathieu-Daudé Sept. 18, 2020, 2:27 p.m. UTC | #2
On 9/18/20 4:23 PM, Philippe Mathieu-Daudé wrote:
> The 'arm_quanta_gsj_initrd' test is timeouting on GitLab CI:

> https://gitlab.com/philmd/qemu/-/jobs/745483978#L846

> 

> Use the same trick from the 'arm_quanta_gsj' test to reduce the

> systemd services started and get quicker to the shell prompt.

> 

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---

>  tests/acceptance/boot_linux_console.py | 3 +++

>  1 file changed, 3 insertions(+)

> 

> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py

> index 4a366ce93e4..7748febbf54 100644

> --- a/tests/acceptance/boot_linux_console.py

> +++ b/tests/acceptance/boot_linux_console.py

> @@ -638,6 +638,9 @@ def test_arm_quanta_gsj_initrd(self):

>  

>          self.vm.set_console()

>          kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

> +                               'initcall_blacklist=npcm_i2c_bus_driver_init '

> +                               'systemd.mask=systemd-random-seed.service '

> +                               'systemd.mask=dropbearkey.service '

>                                 'console=ttyS0,115200n8 '

>                                 'earlycon=uart8250,mmio32,0xf0001000')

>          self.vm.add_args('-kernel', kernel_path,

> 


Bah unfortunately this is still not enough :(
Havard Skinnemoen Sept. 18, 2020, 3:29 p.m. UTC | #3
On Fri, Sep 18, 2020 at 7:27 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>

> On 9/18/20 4:23 PM, Philippe Mathieu-Daudé wrote:

> > The 'arm_quanta_gsj_initrd' test is timeouting on GitLab CI:

> > https://gitlab.com/philmd/qemu/-/jobs/745483978#L846

> >

> > Use the same trick from the 'arm_quanta_gsj' test to reduce the

> > systemd services started and get quicker to the shell prompt.

> >

> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> > ---

> >  tests/acceptance/boot_linux_console.py | 3 +++

> >  1 file changed, 3 insertions(+)

> >

> > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py

> > index 4a366ce93e4..7748febbf54 100644

> > --- a/tests/acceptance/boot_linux_console.py

> > +++ b/tests/acceptance/boot_linux_console.py

> > @@ -638,6 +638,9 @@ def test_arm_quanta_gsj_initrd(self):

> >

> >          self.vm.set_console()

> >          kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

> > +                               'initcall_blacklist=npcm_i2c_bus_driver_init '

> > +                               'systemd.mask=systemd-random-seed.service '

> > +                               'systemd.mask=dropbearkey.service '

> >                                 'console=ttyS0,115200n8 '

> >                                 'earlycon=uart8250,mmio32,0xf0001000')

> >          self.vm.add_args('-kernel', kernel_path,

> >

>

> Bah unfortunately this is still not enough :(


Right, this patch modifies the initrd test, but that's not the one
that timed out.

(10/40) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_quanta_gsj:
 INTERRUPTED: Test interrupted by SIGTERM\nRunner error occurred:
Timeout reached\nOriginal status: ERROR\n{'name':
'10-tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_quanta_gsj',
'logdir': '/builds/philmd/qemu/build/tests/results/job-2020-09-18T13.41-b9...
(90.81 s)
 (11/40) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_quanta_gsj_initrd:
 PASS (27.00 s)

Havard
diff mbox series

Patch

diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 4a366ce93e4..7748febbf54 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -638,6 +638,9 @@  def test_arm_quanta_gsj_initrd(self):
 
         self.vm.set_console()
         kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                               'initcall_blacklist=npcm_i2c_bus_driver_init '
+                               'systemd.mask=systemd-random-seed.service '
+                               'systemd.mask=dropbearkey.service '
                                'console=ttyS0,115200n8 '
                                'earlycon=uart8250,mmio32,0xf0001000')
         self.vm.add_args('-kernel', kernel_path,