[PATCH] tests/functional/test_ppc_bamboo: Replace broken link with working assets

Thomas Huth posted 1 patch 5 months, 1 week ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20250707184736.88660-1-thuth@redhat.com
tests/functional/test_ppc_bamboo.py | 34 ++++++++++++++++-------------
1 file changed, 19 insertions(+), 15 deletions(-)
[PATCH] tests/functional/test_ppc_bamboo: Replace broken link with working assets
Posted by Thomas Huth 5 months, 1 week ago
From: Thomas Huth <thuth@redhat.com>

The old image that we used for testing the bamboo machine has disappeared
from the internet. Fortunately there is another kernel + initrd provided
by Cédric that can be used for testing this machine, too.

Reported-by: Stefan Hajnoczi <stefanha@gmail.com>
Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/functional/test_ppc_bamboo.py | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/tests/functional/test_ppc_bamboo.py b/tests/functional/test_ppc_bamboo.py
index fddcc24d0da..c634ae7b4a7 100755
--- a/tests/functional/test_ppc_bamboo.py
+++ b/tests/functional/test_ppc_bamboo.py
@@ -16,28 +16,32 @@ class BambooMachine(QemuSystemTest):
 
     timeout = 90
 
-    ASSET_IMAGE = Asset(
-        ('http://landley.net/aboriginal/downloads/binaries/'
-         'system-image-powerpc-440fp.tar.gz'),
-        'c12b58f841c775a0e6df4832a55afe6b74814d1565d08ddeafc1fb949a075c5e')
+    ASSET_KERNEL = Asset(
+        ('https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main/'
+         'buildroot/qemu_ppc_bamboo-2023.11-8-gdcd9f0f6eb-20240105/vmlinux'),
+        'a2e12eb45b73491ac62fc0bbeb68dead0dc5c0f22cf83146558389209b420ad1')
+    ASSET_INITRD = Asset(
+        ('https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main/'
+         'buildroot/qemu_ppc_bamboo-2023.11-8-gdcd9f0f6eb-20240105/rootfs.cpio'),
+        'd2a36bdb8763b389765dc8c29d4904cec2bd001c587f92e85ab9eb10d5ddda54')
 
     def test_ppc_bamboo(self):
         self.set_machine('bamboo')
         self.require_accelerator("tcg")
         self.require_netdev('user')
-        self.archive_extract(self.ASSET_IMAGE)
+
+        kernel = self.ASSET_KERNEL.fetch()
+        initrd = self.ASSET_INITRD.fetch()
+
         self.vm.set_console()
-        self.vm.add_args('-kernel',
-                         self.scratch_file('system-image-powerpc-440fp',
-                                           'linux'),
-                         '-initrd',
-                         self.scratch_file('system-image-powerpc-440fp',
-                                           'rootfs.cpio.gz'),
-                         '-nic', 'user,model=rtl8139,restrict=on')
+        self.vm.add_args('-kernel', kernel,
+                         '-initrd', initrd,
+                         '-nic', 'user,model=virtio-net-pci,restrict=on')
         self.vm.launch()
-        wait_for_console_pattern(self, 'Type exit when done')
-        exec_command_and_wait_for_pattern(self, 'ping 10.0.2.2',
-                                          '10.0.2.2 is alive!')
+        wait_for_console_pattern(self, 'buildroot login:')
+        exec_command_and_wait_for_pattern(self, 'root', '#')
+        exec_command_and_wait_for_pattern(self, 'ping -c1 10.0.2.2',
+                '1 packets transmitted, 1 packets received, 0% packet loss')
         exec_command_and_wait_for_pattern(self, 'halt', 'System Halted')
 
 if __name__ == '__main__':
-- 
2.50.0


Re: [PATCH] tests/functional/test_ppc_bamboo: Replace broken link with working assets
Posted by Cédric Le Goater 5 months, 1 week ago
On 7/7/25 20:47, Thomas Huth wrote:
> From: Thomas Huth <thuth@redhat.com>
> 
> The old image that we used for testing the bamboo machine has disappeared
> from the internet. Fortunately there is another kernel + initrd provided
> by Cédric that can be used for testing this machine, too.
> 
> Reported-by: Stefan Hajnoczi <stefanha@gmail.com>
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   tests/functional/test_ppc_bamboo.py | 34 ++++++++++++++++-------------
>   1 file changed, 19 insertions(+), 15 deletions(-)
> 
> diff --git a/tests/functional/test_ppc_bamboo.py b/tests/functional/test_ppc_bamboo.py
> index fddcc24d0da..c634ae7b4a7 100755
> --- a/tests/functional/test_ppc_bamboo.py
> +++ b/tests/functional/test_ppc_bamboo.py
> @@ -16,28 +16,32 @@ class BambooMachine(QemuSystemTest):
>   
>       timeout = 90
>   
> -    ASSET_IMAGE = Asset(
> -        ('http://landley.net/aboriginal/downloads/binaries/'
> -         'system-image-powerpc-440fp.tar.gz'),
> -        'c12b58f841c775a0e6df4832a55afe6b74814d1565d08ddeafc1fb949a075c5e')
> +    ASSET_KERNEL = Asset(
> +        ('https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main/'
> +         'buildroot/qemu_ppc_bamboo-2023.11-8-gdcd9f0f6eb-20240105/vmlinux'),
> +        'a2e12eb45b73491ac62fc0bbeb68dead0dc5c0f22cf83146558389209b420ad1')
> +    ASSET_INITRD = Asset(
> +        ('https://github.com/legoater/qemu-ppc-boot/raw/refs/heads/main/'
> +         'buildroot/qemu_ppc_bamboo-2023.11-8-gdcd9f0f6eb-20240105/rootfs.cpio'),
> +        'd2a36bdb8763b389765dc8c29d4904cec2bd001c587f92e85ab9eb10d5ddda54')
>   
>       def test_ppc_bamboo(self):
>           self.set_machine('bamboo')
>           self.require_accelerator("tcg")
>           self.require_netdev('user')
> -        self.archive_extract(self.ASSET_IMAGE)
> +
> +        kernel = self.ASSET_KERNEL.fetch()
> +        initrd = self.ASSET_INITRD.fetch()
> +
>           self.vm.set_console()
> -        self.vm.add_args('-kernel',
> -                         self.scratch_file('system-image-powerpc-440fp',
> -                                           'linux'),
> -                         '-initrd',
> -                         self.scratch_file('system-image-powerpc-440fp',
> -                                           'rootfs.cpio.gz'),
> -                         '-nic', 'user,model=rtl8139,restrict=on')
> +        self.vm.add_args('-kernel', kernel,
> +                         '-initrd', initrd,
> +                         '-nic', 'user,model=virtio-net-pci,restrict=on')
>           self.vm.launch()
> -        wait_for_console_pattern(self, 'Type exit when done')
> -        exec_command_and_wait_for_pattern(self, 'ping 10.0.2.2',
> -                                          '10.0.2.2 is alive!')
> +        wait_for_console_pattern(self, 'buildroot login:')
> +        exec_command_and_wait_for_pattern(self, 'root', '#')
> +        exec_command_and_wait_for_pattern(self, 'ping -c1 10.0.2.2',
> +                '1 packets transmitted, 1 packets received, 0% packet loss')
>           exec_command_and_wait_for_pattern(self, 'halt', 'System Halted')
>   
>   if __name__ == '__main__':