| Message ID | 20250226065013.196052-1-clg@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | tests/functional: Replace the ppc64 e500 advent calendar test | expand |
On 26/02/2025 07.50, Cédric Le Goater wrote: > Replace the advent calendar test with a buildroot image built with > qemu_ppc64_e5500_defconfig. When picking this up, I'll add a "Unlike the advent calendar image, this newer buildroot image supports networking, too, so we can check whether it gets assigned with an IP address" as justification for the replacement, ok? > Boot a ppce500 machine from kernel and > disk, test network and poweroff. Add '-no-shutdown' to the command > line to avoid exiting from QEMU as it seems to bother the functional > framework. > > Signed-off-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > tests/functional/test_ppc64_e500.py | 33 +++++++++++++++++++++++------ > 1 file changed, 26 insertions(+), 7 deletions(-) > > diff --git a/tests/functional/test_ppc64_e500.py b/tests/functional/test_ppc64_e500.py > index b92fe0b0e75e..9ce7ae6c4798 100755 > --- a/tests/functional/test_ppc64_e500.py > +++ b/tests/functional/test_ppc64_e500.py > @@ -5,20 +5,39 @@ > # SPDX-License-Identifier: GPL-2.0-or-later > > from qemu_test import LinuxKernelTest, Asset > +from qemu_test import exec_command_and_wait_for_pattern > > > class E500Test(LinuxKernelTest): > > - ASSET_DAY19 = Asset( > - 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day19.tar.xz', > - '20b1bb5a8488c664defbb5d283addc91a05335a936c63b3f5ff7eee74b725755') > + ASSET_BR2_E5500_UIMAGE = Asset( > + 'https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main/buildroot/qemu_ppc64_e5500-2023.11-8-gdcd9f0f6eb-20240104/uImage', > + '2478187c455d6cca3984e9dfde9c635d824ea16236b85fd6b4809f744706deda') > > - def test_ppc64_e500(self): > + ASSET_BR2_E5500_ROOTFS = Asset( > + 'https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main//buildroot/qemu_ppc64_e5500-2023.11-8-gdcd9f0f6eb-20240104/rootfs.ext2', > + '9035ef97237c84c7522baaff17d25cdfca4bb7a053d5e296e902919473423d76') > + > + def test_ppc64_e500_buildroot(self): > self.set_machine('ppce500') > self.cpu = 'e5500' > - self.archive_extract(self.ASSET_DAY19) > - self.launch_kernel(self.scratch_file('day19', 'uImage'), > - wait_for='QEMU advent calendar') > + > + uimage_path = self.ASSET_BR2_E5500_UIMAGE.fetch() > + rootfs_path = self.ASSET_BR2_E5500_ROOTFS.fetch() > + > + self.vm.set_console() > + self.vm.add_args('-kernel', uimage_path, > + '-append', 'root=/dev/vda', > + '-drive', f'file={rootfs_path},if=virtio,format=raw', > + '-snapshot', '-no-shutdown') > + self.vm.launch() > + > + self.wait_for_console_pattern('Linux version') > + self.wait_for_console_pattern('/init as init process') > + self.wait_for_console_pattern('lease of 10.0.2.15') > + self.wait_for_console_pattern('buildroot login:') > + exec_command_and_wait_for_pattern(self, 'root', '#') > + exec_command_and_wait_for_pattern(self, 'poweroff', 'Power down') > > if __name__ == '__main__': > LinuxKernelTest.main()
diff --git a/tests/functional/test_ppc64_e500.py b/tests/functional/test_ppc64_e500.py index b92fe0b0e75e..9ce7ae6c4798 100755 --- a/tests/functional/test_ppc64_e500.py +++ b/tests/functional/test_ppc64_e500.py @@ -5,20 +5,39 @@ # SPDX-License-Identifier: GPL-2.0-or-later from qemu_test import LinuxKernelTest, Asset +from qemu_test import exec_command_and_wait_for_pattern class E500Test(LinuxKernelTest): - ASSET_DAY19 = Asset( - 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day19.tar.xz', - '20b1bb5a8488c664defbb5d283addc91a05335a936c63b3f5ff7eee74b725755') + ASSET_BR2_E5500_UIMAGE = Asset( + 'https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main/buildroot/qemu_ppc64_e5500-2023.11-8-gdcd9f0f6eb-20240104/uImage', + '2478187c455d6cca3984e9dfde9c635d824ea16236b85fd6b4809f744706deda') - def test_ppc64_e500(self): + ASSET_BR2_E5500_ROOTFS = Asset( + 'https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main//buildroot/qemu_ppc64_e5500-2023.11-8-gdcd9f0f6eb-20240104/rootfs.ext2', + '9035ef97237c84c7522baaff17d25cdfca4bb7a053d5e296e902919473423d76') + + def test_ppc64_e500_buildroot(self): self.set_machine('ppce500') self.cpu = 'e5500' - self.archive_extract(self.ASSET_DAY19) - self.launch_kernel(self.scratch_file('day19', 'uImage'), - wait_for='QEMU advent calendar') + + uimage_path = self.ASSET_BR2_E5500_UIMAGE.fetch() + rootfs_path = self.ASSET_BR2_E5500_ROOTFS.fetch() + + self.vm.set_console() + self.vm.add_args('-kernel', uimage_path, + '-append', 'root=/dev/vda', + '-drive', f'file={rootfs_path},if=virtio,format=raw', + '-snapshot', '-no-shutdown') + self.vm.launch() + + self.wait_for_console_pattern('Linux version') + self.wait_for_console_pattern('/init as init process') + self.wait_for_console_pattern('lease of 10.0.2.15') + self.wait_for_console_pattern('buildroot login:') + exec_command_and_wait_for_pattern(self, 'root', '#') + exec_command_and_wait_for_pattern(self, 'poweroff', 'Power down') if __name__ == '__main__': LinuxKernelTest.main()
Replace the advent calendar test with a buildroot image built with qemu_ppc64_e5500_defconfig. Boot a ppce500 machine from kernel and disk, test network and poweroff. Add '-no-shutdown' to the command line to avoid exiting from QEMU as it seems to bother the functional framework. Signed-off-by: Cédric Le Goater <clg@redhat.com> --- tests/functional/test_ppc64_e500.py | 33 +++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-)