Re: [PULL 32/36] tests/acceptance: console boot tests for quanta-gsj
On Fri, Sep 18, 2020 at 6:57 AM Philippe Mathieu-Daudé
wrote:
>
> On Fri, Sep 18, 2020 at 3:52 PM Philippe Mathieu-Daudé
> wrote:
> >
> > Hi Havard,
> >
> > On Mon, Sep 14, 2020 at 5:47 PM Peter Maydell
> > wrote:
> > >
> > > From: Havard Skinnemoen
> > >
> > > This adds two acceptance tests for the quanta-gsj machine.
> > >
> > > One test downloads a lightly patched openbmc flash image from github and
> > > verifies that it boots all the way to the login prompt.
> > >
> > > The other test downloads a kernel, initrd and dtb built from the same
> > > openbmc source and verifies that the kernel detects all CPUs and boots
> > > to the point where it can't find the root filesystem (because we have no
> > > flash image in this case).
> > >
> > > Reviewed-by: Philippe Mathieu-Daudé
> > > Tested-by: Philippe Mathieu-Daudé
> > > Signed-off-by: Havard Skinnemoen
> > > Message-id: 20200911052101.2602693-15-hskinnem...@google.com
> > > Signed-off-by: Peter Maydell
> > > ---
> > [...]
> > > +def test_arm_quanta_gsj_initrd(self):
> > > +"""
> > > +:avocado: tags=arch:arm
> > > +:avocado: tags=machine:quanta-gsj
> > > +"""
> > > +initrd_url = (
> > > +
> > > 'https://github.com/hskinnemoen/openbmc/releases/download/'
> > > +
> > > '20200711-gsj-qemu-0/obmc-phosphor-initramfs-gsj.cpio.xz')
> > > +initrd_hash = '98fefe5d7e56727b1eb17d5c00311b1b5c945300'
> > > +initrd_path = self.fetch_asset(initrd_url,
> > > asset_hash=initrd_hash)
> > > +kernel_url = (
> > > +
> > > 'https://github.com/hskinnemoen/openbmc/releases/download/'
> > > +'20200711-gsj-qemu-0/uImage-gsj.bin')
> > > +kernel_hash = 'fa67b2f141d56d39b3c54305c0e8a899c99eb2c7'
> > > +kernel_path = self.fetch_asset(kernel_url,
> > > asset_hash=kernel_hash)
> > > +dtb_url = (
> > > +
> > > 'https://github.com/hskinnemoen/openbmc/releases/download/'
> > > +'20200711-gsj-qemu-0/nuvoton-npcm730-gsj.dtb')
> > > +dtb_hash = '18315f7006d7b688d8312d5c727eecd819aa36a4'
> > > +dtb_path = self.fetch_asset(dtb_url, asset_hash=dtb_hash)
> > > +
> > > +self.vm.set_console()
> > > +kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
> > > + 'console=ttyS0,115200n8 '
> > > + 'earlycon=uart8250,mmio32,0xf0001000')
> > > +self.vm.add_args('-kernel', kernel_path,
> > > + '-initrd', initrd_path,
> > > + '-dtb', dtb_path,
> > > + '-append', kernel_command_line)
> > > +self.vm.launch()
> > > +
> > > +self.wait_for_console_pattern('Booting Linux on physical CPU
> > > 0x0')
> > > +self.wait_for_console_pattern('CPU1: thread -1, cpu 1, socket 0')
> > > +self.wait_for_console_pattern(
> > > +'Give root password for system maintenance')
> >
> > This test is failing (timeout) on our CI:
>
> Oops I meant to keep the other one: test_arm_quanta_gsj
> (not test_arm_quanta_gsj_initrd).
>
> > https://gitlab.com/philmd/qemu/-/jobs/745483978#L857
Sorry about that. It only takes 60-ish seconds on my (admittedly beefy) machine.
Havard
Re: [PULL 32/36] tests/acceptance: console boot tests for quanta-gsj
On Fri, Sep 18, 2020 at 3:52 PM Philippe Mathieu-Daudé
wrote:
>
> Hi Havard,
>
> On Mon, Sep 14, 2020 at 5:47 PM Peter Maydell
> wrote:
> >
> > From: Havard Skinnemoen
> >
> > This adds two acceptance tests for the quanta-gsj machine.
> >
> > One test downloads a lightly patched openbmc flash image from github and
> > verifies that it boots all the way to the login prompt.
> >
> > The other test downloads a kernel, initrd and dtb built from the same
> > openbmc source and verifies that the kernel detects all CPUs and boots
> > to the point where it can't find the root filesystem (because we have no
> > flash image in this case).
> >
> > Reviewed-by: Philippe Mathieu-Daudé
> > Tested-by: Philippe Mathieu-Daudé
> > Signed-off-by: Havard Skinnemoen
> > Message-id: 20200911052101.2602693-15-hskinnem...@google.com
> > Signed-off-by: Peter Maydell
> > ---
> [...]
> > +def test_arm_quanta_gsj_initrd(self):
> > +"""
> > +:avocado: tags=arch:arm
> > +:avocado: tags=machine:quanta-gsj
> > +"""
> > +initrd_url = (
> > +'https://github.com/hskinnemoen/openbmc/releases/download/'
> > +'20200711-gsj-qemu-0/obmc-phosphor-initramfs-gsj.cpio.xz')
> > +initrd_hash = '98fefe5d7e56727b1eb17d5c00311b1b5c945300'
> > +initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
> > +kernel_url = (
> > +'https://github.com/hskinnemoen/openbmc/releases/download/'
> > +'20200711-gsj-qemu-0/uImage-gsj.bin')
> > +kernel_hash = 'fa67b2f141d56d39b3c54305c0e8a899c99eb2c7'
> > +kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
> > +dtb_url = (
> > +'https://github.com/hskinnemoen/openbmc/releases/download/'
> > +'20200711-gsj-qemu-0/nuvoton-npcm730-gsj.dtb')
> > +dtb_hash = '18315f7006d7b688d8312d5c727eecd819aa36a4'
> > +dtb_path = self.fetch_asset(dtb_url, asset_hash=dtb_hash)
> > +
> > +self.vm.set_console()
> > +kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
> > + 'console=ttyS0,115200n8 '
> > + 'earlycon=uart8250,mmio32,0xf0001000')
> > +self.vm.add_args('-kernel', kernel_path,
> > + '-initrd', initrd_path,
> > + '-dtb', dtb_path,
> > + '-append', kernel_command_line)
> > +self.vm.launch()
> > +
> > +self.wait_for_console_pattern('Booting Linux on physical CPU 0x0')
> > +self.wait_for_console_pattern('CPU1: thread -1, cpu 1, socket 0')
> > +self.wait_for_console_pattern(
> > +'Give root password for system maintenance')
>
> This test is failing (timeout) on our CI:
Oops I meant to keep the other one: test_arm_quanta_gsj
(not test_arm_quanta_gsj_initrd).
> https://gitlab.com/philmd/qemu/-/jobs/745483978#L857
Re: [PULL 32/36] tests/acceptance: console boot tests for quanta-gsj
Hi Havard,
On Mon, Sep 14, 2020 at 5:47 PM Peter Maydell wrote:
>
> From: Havard Skinnemoen
>
> This adds two acceptance tests for the quanta-gsj machine.
>
> One test downloads a lightly patched openbmc flash image from github and
> verifies that it boots all the way to the login prompt.
>
> The other test downloads a kernel, initrd and dtb built from the same
> openbmc source and verifies that the kernel detects all CPUs and boots
> to the point where it can't find the root filesystem (because we have no
> flash image in this case).
>
> Reviewed-by: Philippe Mathieu-Daudé
> Tested-by: Philippe Mathieu-Daudé
> Signed-off-by: Havard Skinnemoen
> Message-id: 20200911052101.2602693-15-hskinnem...@google.com
> Signed-off-by: Peter Maydell
> ---
[...]
> +def test_arm_quanta_gsj_initrd(self):
> +"""
> +:avocado: tags=arch:arm
> +:avocado: tags=machine:quanta-gsj
> +"""
> +initrd_url = (
> +'https://github.com/hskinnemoen/openbmc/releases/download/'
> +'20200711-gsj-qemu-0/obmc-phosphor-initramfs-gsj.cpio.xz')
> +initrd_hash = '98fefe5d7e56727b1eb17d5c00311b1b5c945300'
> +initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
> +kernel_url = (
> +'https://github.com/hskinnemoen/openbmc/releases/download/'
> +'20200711-gsj-qemu-0/uImage-gsj.bin')
> +kernel_hash = 'fa67b2f141d56d39b3c54305c0e8a899c99eb2c7'
> +kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
> +dtb_url = (
> +'https://github.com/hskinnemoen/openbmc/releases/download/'
> +'20200711-gsj-qemu-0/nuvoton-npcm730-gsj.dtb')
> +dtb_hash = '18315f7006d7b688d8312d5c727eecd819aa36a4'
> +dtb_path = self.fetch_asset(dtb_url, asset_hash=dtb_hash)
> +
> +self.vm.set_console()
> +kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
> + 'console=ttyS0,115200n8 '
> + 'earlycon=uart8250,mmio32,0xf0001000')
> +self.vm.add_args('-kernel', kernel_path,
> + '-initrd', initrd_path,
> + '-dtb', dtb_path,
> + '-append', kernel_command_line)
> +self.vm.launch()
> +
> +self.wait_for_console_pattern('Booting Linux on physical CPU 0x0')
> +self.wait_for_console_pattern('CPU1: thread -1, cpu 1, socket 0')
> +self.wait_for_console_pattern(
> +'Give root password for system maintenance')
This test is failing (timeout) on our CI:
https://gitlab.com/philmd/qemu/-/jobs/745483978#L857
[PULL 32/36] tests/acceptance: console boot tests for quanta-gsj
From: Havard Skinnemoen
This adds two acceptance tests for the quanta-gsj machine.
One test downloads a lightly patched openbmc flash image from github and
verifies that it boots all the way to the login prompt.
The other test downloads a kernel, initrd and dtb built from the same
openbmc source and verifies that the kernel detects all CPUs and boots
to the point where it can't find the root filesystem (because we have no
flash image in this case).
Reviewed-by: Philippe Mathieu-Daudé
Tested-by: Philippe Mathieu-Daudé
Signed-off-by: Havard Skinnemoen
Message-id: 20200911052101.2602693-15-hskinnem...@google.com
Signed-off-by: Peter Maydell
---
tests/acceptance/boot_linux_console.py | 83 ++
1 file changed, 83 insertions(+)
diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
index aaa781a5813..4a366ce93e4 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -568,6 +568,89 @@ class BootLinuxConsole(LinuxKernelTest):
'sda')
# cubieboard's reboot is not functioning; omit reboot test.
+def test_arm_quanta_gsj(self):
+"""
+:avocado: tags=arch:arm
+:avocado: tags=machine:quanta-gsj
+"""
+# 25 MiB compressed, 32 MiB uncompressed.
+image_url = (
+'https://github.com/hskinnemoen/openbmc/releases/download/'
+'20200711-gsj-qemu-0/obmc-phosphor-image-gsj.static.mtd.gz')
+image_hash = '14895e634923345cb5c8776037ff7876df96f6b1'
+image_path_gz = self.fetch_asset(image_url, asset_hash=image_hash)
+image_name = 'obmc.mtd'
+image_path = os.path.join(self.workdir, image_name)
+archive.gzip_uncompress(image_path_gz, image_path)
+
+self.vm.set_console()
+drive_args = 'file=' + image_path + ',if=mtd,bus=0,unit=0'
+self.vm.add_args('-drive', drive_args)
+self.vm.launch()
+
+# Disable drivers and services that stall for a long time during boot,
+# to avoid running past the 90-second timeout. These may be removed
+# as the corresponding device support is added.
+kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + (
+'console=${console} '
+'mem=${mem} '
+'initcall_blacklist=npcm_i2c_bus_driver_init '
+'systemd.mask=systemd-random-seed.service '
+'systemd.mask=dropbearkey.service '
+)
+
+self.wait_for_console_pattern('> BootBlock by Nuvoton')
+self.wait_for_console_pattern('>Device: Poleg BMC NPCM730')
+self.wait_for_console_pattern('>Skip DDR init.')
+self.wait_for_console_pattern('U-Boot ')
+interrupt_interactive_console_until_pattern(
+self, 'Hit any key to stop autoboot:', 'U-Boot>')
+exec_command_and_wait_for_pattern(
+self, "setenv bootargs ${bootargs} " + kernel_command_line,
+'U-Boot>')
+exec_command_and_wait_for_pattern(
+self, 'run romboot', 'Booting Kernel from flash')
+self.wait_for_console_pattern('Booting Linux on physical CPU 0x0')
+self.wait_for_console_pattern('CPU1: thread -1, cpu 1, socket 0')
+self.wait_for_console_pattern('OpenBMC Project Reference Distro')
+self.wait_for_console_pattern('gsj login:')
+
+def test_arm_quanta_gsj_initrd(self):
+"""
+:avocado: tags=arch:arm
+:avocado: tags=machine:quanta-gsj
+"""
+initrd_url = (
+'https://github.com/hskinnemoen/openbmc/releases/download/'
+'20200711-gsj-qemu-0/obmc-phosphor-initramfs-gsj.cpio.xz')
+initrd_hash = '98fefe5d7e56727b1eb17d5c00311b1b5c945300'
+initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+kernel_url = (
+'https://github.com/hskinnemoen/openbmc/releases/download/'
+'20200711-gsj-qemu-0/uImage-gsj.bin')
+kernel_hash = 'fa67b2f141d56d39b3c54305c0e8a899c99eb2c7'
+kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+dtb_url = (
+'https://github.com/hskinnemoen/openbmc/releases/download/'
+'20200711-gsj-qemu-0/nuvoton-npcm730-gsj.dtb')
+dtb_hash = '18315f7006d7b688d8312d5c727eecd819aa36a4'
+dtb_path = self.fetch_asset(dtb_url, asset_hash=dtb_hash)
+
+self.vm.set_console()
+kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=ttyS0,115200n8 '
+ 'earlycon=uart8250,mmio32,0xf0001000')
+self.vm.add_args('-kernel', kernel_path,
+ '-initrd', initrd_path,
+ '-dtb', dtb_path,
+ '-append', kernel_command_line)
+self.vm.launch()
+
+
