| Message ID | 20240717130657.648701-1-clg@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/avocado/machine_aspeed.py: Add eMMC boot tests | expand |
On 17/7/24 15:06, Cédric Le Goater wrote: > The image was built using the process described in commit c8cb19876d3e > ("hw/sd/sdcard: Support boot area in emmc image") with artefacts from > the latest successful build of the IBM P10 BMC platform available on: > > https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=p10bmc/lastSuccessfulBuild/ > > Signed-off-by: Cédric Le Goater <clg@redhat.com> > --- > tests/avocado/machine_aspeed.py | 38 +++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py > index f66ad38d3503..1deb8472818f 100644 > --- a/tests/avocado/machine_aspeed.py > +++ b/tests/avocado/machine_aspeed.py > @@ -439,3 +439,41 @@ def test_aarch64_ast2700_evb_sdk_v09_02(self): > self.wait_for_console_pattern('nodistro.0 ast2700-default ttyS12') > self.ssh_connect('root', '0penBmc', False) > > +class AST2x00MachineMMC(QemuSystemTest): > + > + timeout = 240 > + > + def wait_for_console_pattern(self, success_message, vm=None): > + wait_for_console_pattern(self, success_message, > + failure_message='Kernel panic - not syncing', > + vm=vm) > + > + def test_arm_aspeed_emmc_boot(self): > + """ > + :avocado: tags=arch:arm > + :avocado: tags=machine:rainier-bmc :avocado: tags=device:emmc Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > + """ $ make check-avocado AVOCADO_TAGS=machine:rainier-bmc Fetching asset from tests/avocado/boot_linux_console.py:BootLinuxConsole.test_arm_ast2600_debian Fetching asset from tests/avocado/machine_aspeed.py:AST2x00MachineMMC.test_arm_aspeed_emmc_boot JOB ID : ed89ecf5e166e7f636cc731c0242ba6e714fea39 JOB LOG : build/tests/results/job-2024-07-17T14.45-ed89ecf/job.log (1/2) tests/avocado/boot_linux_console.py:BootLinuxConsole.test_arm_ast2600_debian: PASS (21.55 s) (2/2) tests/avocado/machine_aspeed.py:AST2x00MachineMMC.test_arm_aspeed_emmc_boot: PASS (43.71 s) RESULTS : PASS 2 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 JOB TIME : 174.68 s Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 17/7/24 15:06, Cédric Le Goater wrote: > The image was built using the process described in commit c8cb19876d3e > ("hw/sd/sdcard: Support boot area in emmc image") with artefacts from > the latest successful build of the IBM P10 BMC platform available on: > > https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=p10bmc/lastSuccessfulBuild/ > > Signed-off-by: Cédric Le Goater <clg@redhat.com> > --- BTW this patch is Based-on: <20240717063022.549849-1-clg@redhat.com> > tests/avocado/machine_aspeed.py | 38 +++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py > index f66ad38d3503..1deb8472818f 100644 > --- a/tests/avocado/machine_aspeed.py > +++ b/tests/avocado/machine_aspeed.py > @@ -439,3 +439,41 @@ def test_aarch64_ast2700_evb_sdk_v09_02(self): > self.wait_for_console_pattern('nodistro.0 ast2700-default ttyS12') > self.ssh_connect('root', '0penBmc', False) > > +class AST2x00MachineMMC(QemuSystemTest): > + > + timeout = 240 > + > + def wait_for_console_pattern(self, success_message, vm=None): > + wait_for_console_pattern(self, success_message, > + failure_message='Kernel panic - not syncing', > + vm=vm) > + > + def test_arm_aspeed_emmc_boot(self): > + """ > + :avocado: tags=arch:arm > + :avocado: tags=machine:rainier-bmc > + """ > + > + image_url = ('https://fileserver.linaro.org/s/B6pJTwWEkzSDi36/download/' > + 'mmc-p10bmc-20240617.qcow2') > + image_hash = ('d523fb478d2b84d5adc5658d08502bc64b1486955683814f89c6137518acd90b') > + image_path = self.fetch_asset(image_url, asset_hash=image_hash, > + algorithm='sha256') > + > + self.require_netdev('user') > + > + self.vm.set_console() > + self.vm.add_args('-drive', > + 'file=' + image_path + ',if=sd,id=sd2,index=2', > + '-net', 'nic', '-net', 'user') > + self.vm.launch() > + > + self.wait_for_console_pattern('U-Boot SPL 2019.04') > + self.wait_for_console_pattern('Trying to boot from MMC1') > + self.wait_for_console_pattern('U-Boot 2019.04') > + self.wait_for_console_pattern('eMMC 2nd Boot') > + self.wait_for_console_pattern('## Loading kernel from FIT Image') > + self.wait_for_console_pattern('Starting kernel ...') > + self.wait_for_console_pattern('Booting Linux on physical CPU 0xf00') > + self.wait_for_console_pattern('mmcblk0: p1 p2 p3 p4 p5 p6 p7') > + self.wait_for_console_pattern('IBM eBMC (OpenBMC for IBM Enterprise')
On 7/17/24 15:49, Philippe Mathieu-Daudé wrote: > On 17/7/24 15:06, Cédric Le Goater wrote: >> The image was built using the process described in commit c8cb19876d3e >> ("hw/sd/sdcard: Support boot area in emmc image") with artefacts from >> the latest successful build of the IBM P10 BMC platform available on: >> >> https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=p10bmc/lastSuccessfulBuild/ >> >> Signed-off-by: Cédric Le Goater <clg@redhat.com> >> --- >> tests/avocado/machine_aspeed.py | 38 +++++++++++++++++++++++++++++++++ >> 1 file changed, 38 insertions(+) >> >> diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py >> index f66ad38d3503..1deb8472818f 100644 >> --- a/tests/avocado/machine_aspeed.py >> +++ b/tests/avocado/machine_aspeed.py >> @@ -439,3 +439,41 @@ def test_aarch64_ast2700_evb_sdk_v09_02(self): >> self.wait_for_console_pattern('nodistro.0 ast2700-default ttyS12') >> self.ssh_connect('root', '0penBmc', False) >> +class AST2x00MachineMMC(QemuSystemTest): >> + >> + timeout = 240 >> + >> + def wait_for_console_pattern(self, success_message, vm=None): >> + wait_for_console_pattern(self, success_message, >> + failure_message='Kernel panic - not syncing', >> + vm=vm) >> + >> + def test_arm_aspeed_emmc_boot(self): >> + """ >> + :avocado: tags=arch:arm >> + :avocado: tags=machine:rainier-bmc > > :avocado: tags=device:emmc updated. > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > >> + """ > > $ make check-avocado AVOCADO_TAGS=machine:rainier-bmc > Fetching asset from tests/avocado/boot_linux_console.py:BootLinuxConsole.test_arm_ast2600_debian > Fetching asset from tests/avocado/machine_aspeed.py:AST2x00MachineMMC.test_arm_aspeed_emmc_boot > JOB ID : ed89ecf5e166e7f636cc731c0242ba6e714fea39 > JOB LOG : build/tests/results/job-2024-07-17T14.45-ed89ecf/job.log > (1/2) tests/avocado/boot_linux_console.py:BootLinuxConsole.test_arm_ast2600_debian: PASS (21.55 s) > (2/2) tests/avocado/machine_aspeed.py:AST2x00MachineMMC.test_arm_aspeed_emmc_boot: PASS (43.71 s) > RESULTS : PASS 2 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 > JOB TIME : 174.68 s > > Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Thanks, C.
On 7/17/24 15:06, Cédric Le Goater wrote: > The image was built using the process described in commit c8cb19876d3e > ("hw/sd/sdcard: Support boot area in emmc image") with artefacts from > the latest successful build of the IBM P10 BMC platform available on: > > https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=p10bmc/lastSuccessfulBuild/ > > Signed-off-by: Cédric Le Goater <clg@redhat.com> > --- > tests/avocado/machine_aspeed.py | 38 +++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) Applied to aspeed-next. Thanks, C.
diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index f66ad38d3503..1deb8472818f 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -439,3 +439,41 @@ def test_aarch64_ast2700_evb_sdk_v09_02(self): self.wait_for_console_pattern('nodistro.0 ast2700-default ttyS12') self.ssh_connect('root', '0penBmc', False) +class AST2x00MachineMMC(QemuSystemTest): + + timeout = 240 + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + + def test_arm_aspeed_emmc_boot(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:rainier-bmc + """ + + image_url = ('https://fileserver.linaro.org/s/B6pJTwWEkzSDi36/download/' + 'mmc-p10bmc-20240617.qcow2') + image_hash = ('d523fb478d2b84d5adc5658d08502bc64b1486955683814f89c6137518acd90b') + image_path = self.fetch_asset(image_url, asset_hash=image_hash, + algorithm='sha256') + + self.require_netdev('user') + + self.vm.set_console() + self.vm.add_args('-drive', + 'file=' + image_path + ',if=sd,id=sd2,index=2', + '-net', 'nic', '-net', 'user') + self.vm.launch() + + self.wait_for_console_pattern('U-Boot SPL 2019.04') + self.wait_for_console_pattern('Trying to boot from MMC1') + self.wait_for_console_pattern('U-Boot 2019.04') + self.wait_for_console_pattern('eMMC 2nd Boot') + self.wait_for_console_pattern('## Loading kernel from FIT Image') + self.wait_for_console_pattern('Starting kernel ...') + self.wait_for_console_pattern('Booting Linux on physical CPU 0xf00') + self.wait_for_console_pattern('mmcblk0: p1 p2 p3 p4 p5 p6 p7') + self.wait_for_console_pattern('IBM eBMC (OpenBMC for IBM Enterprise')
The image was built using the process described in commit c8cb19876d3e ("hw/sd/sdcard: Support boot area in emmc image") with artefacts from the latest successful build of the IBM P10 BMC platform available on: https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=p10bmc/lastSuccessfulBuild/ Signed-off-by: Cédric Le Goater <clg@redhat.com> --- tests/avocado/machine_aspeed.py | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)