1. Patchew
  2. QEMU
  3. [PATCH 0/9] aspeed: pre-PR for QEMU 10.0 (RESEND)
  4. View patch

[PATCH 8/9] test/functional: Update buildroot images to 2024.11

Cédric Le Goater posted 9 patches 1 year ago
[PATCH 8/9] test/functional: Update buildroot images to 2024.11
Posted by Cédric Le Goater 1 year ago 
The main changes compared to upstream 2024.11 buildroot are

- bumped Linux to version 6.11.11 with a custom config
- changed U-Boot to OpenBMC branch for more support
- included extra target packages

See branch [1] for more details.

There is a slight output change when powering off the machine,
the console now contains :

    reboot: Power off not available: System halted

Adjust accordingly the expect string in
do_test_arm_aspeed_buildroot_poweroff().

[1] https://github.com/legoater/buildroot/commits/aspeed-2024.11

Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 tests/functional/aspeed.py                  | 2 +-
 tests/functional/test_arm_aspeed_ast2500.py | 8 ++++----
 tests/functional/test_arm_aspeed_ast2600.py | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
index 62f50bab7a33..b52358bb8c61 100644
--- a/tests/functional/aspeed.py
+++ b/tests/functional/aspeed.py
@@ -42,7 +42,7 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'
 
     def do_test_arm_aspeed_buildroot_poweroff(self):
         exec_command_and_wait_for_pattern(self, 'poweroff',
-                                          'reboot: System halted');
+                                          'System halted');
 
     def do_test_arm_aspeed_sdk_start(self, image):
         self.require_netdev('user')
diff --git a/tests/functional/test_arm_aspeed_ast2500.py b/tests/functional/test_arm_aspeed_ast2500.py
index 743fc46eb29e..1ffba6c9953d 100755
--- a/tests/functional/test_arm_aspeed_ast2500.py
+++ b/tests/functional/test_arm_aspeed_ast2500.py
@@ -11,15 +11,15 @@
 
 class AST2500Machine(AspeedTest):
 
-    ASSET_BR2_202311_AST2500_FLASH = Asset(
+    ASSET_BR2_202411_AST2500_FLASH = Asset(
         ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
-         'images/ast2500-evb/buildroot-2023.11/flash.img'),
-        'c23db6160cf77d0258397eb2051162c8473a56c441417c52a91ba217186e715f')
+         'images/ast2500-evb/buildroot-2024.11/flash.img'),
+        '641e6906c18c0f19a2aeb48099d66d4771929c361001d554d0d45c667413e13a')
 
     def test_arm_ast2500_evb_buildroot(self):
         self.set_machine('ast2500-evb')
 
-        image_path = self.ASSET_BR2_202311_AST2500_FLASH.fetch()
+        image_path = self.ASSET_BR2_202411_AST2500_FLASH.fetch()
 
         self.vm.add_args('-device',
                          'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
diff --git a/tests/functional/test_arm_aspeed_ast2600.py b/tests/functional/test_arm_aspeed_ast2600.py
index 21640123ee81..6ae4ed636ac3 100755
--- a/tests/functional/test_arm_aspeed_ast2600.py
+++ b/tests/functional/test_arm_aspeed_ast2600.py
@@ -16,15 +16,15 @@
 
 class AST2600Machine(AspeedTest):
 
-    ASSET_BR2_202311_AST2600_FLASH = Asset(
+    ASSET_BR2_202411_AST2600_FLASH = Asset(
         ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
-         'images/ast2600-evb/buildroot-2023.11/flash.img'),
-        'b62808daef48b438d0728ee07662290490ecfa65987bb91294cafb1bb7ad1a68')
+         'images/ast2600-evb/buildroot-2024.11/flash.img'),
+        '4bb2f3dfdea31199b51d66b42f686dc5374c144a7346fdc650194a5578b73609')
 
     def test_arm_ast2600_evb_buildroot(self):
         self.set_machine('ast2600-evb')
 
-        image_path = self.ASSET_BR2_202311_AST2600_FLASH.fetch()
+        image_path = self.ASSET_BR2_202411_AST2600_FLASH.fetch()
 
         self.vm.add_args('-device',
                          'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
-- 
2.48.1
RE: [PATCH 8/9] test/functional: Update buildroot images to 2024.11
Posted by Jamin Lin 1 year ago 
> From: Cédric Le Goater <clg@redhat.com>
> Sent: Wednesday, January 22, 2025 3:09 PM
> To: qemu-arm@nongnu.org; qemu-devel@nongnu.org
> Cc: Joel Stanley <joel@jms.id.au>; Andrew Jeffery
> <andrew@codeconstruct.com.au>; Troy Lee <troy_lee@aspeedtech.com>;
> Jamin Lin <jamin_lin@aspeedtech.com>; Steven Lee
> <steven_lee@aspeedtech.com>; Cédric Le Goater <clg@redhat.com>
> Subject: [PATCH 8/9] test/functional: Update buildroot images to 2024.11
> 
> The main changes compared to upstream 2024.11 buildroot are
> 
> - bumped Linux to version 6.11.11 with a custom config
> - changed U-Boot to OpenBMC branch for more support
> - included extra target packages
> 
> See branch [1] for more details.
> 
> There is a slight output change when powering off the machine, the console
> now contains :
> 
>     reboot: Power off not available: System halted
> 
> Adjust accordingly the expect string in
> do_test_arm_aspeed_buildroot_poweroff().
> 
> [1] https://github.com/legoater/buildroot/commits/aspeed-2024.11
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>  tests/functional/aspeed.py                  | 2 +-
>  tests/functional/test_arm_aspeed_ast2500.py | 8 ++++----
> tests/functional/test_arm_aspeed_ast2600.py | 8 ++++----
>  3 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py index
> 62f50bab7a33..b52358bb8c61 100644
> --- a/tests/functional/aspeed.py
> +++ b/tests/functional/aspeed.py
> @@ -42,7 +42,7 @@ def do_test_arm_aspeed_buildroot_start(self, image,
> cpu_id, pattern='Aspeed EVB'
> 
>      def do_test_arm_aspeed_buildroot_poweroff(self):
>          exec_command_and_wait_for_pattern(self, 'poweroff',
> -                                          'reboot: System halted');
> +                                          'System halted');
> 
>      def do_test_arm_aspeed_sdk_start(self, image):
>          self.require_netdev('user')
> diff --git a/tests/functional/test_arm_aspeed_ast2500.py
> b/tests/functional/test_arm_aspeed_ast2500.py
> index 743fc46eb29e..1ffba6c9953d 100755
> --- a/tests/functional/test_arm_aspeed_ast2500.py
> +++ b/tests/functional/test_arm_aspeed_ast2500.py
> @@ -11,15 +11,15 @@
> 
>  class AST2500Machine(AspeedTest):
> 
> -    ASSET_BR2_202311_AST2500_FLASH = Asset(
> +    ASSET_BR2_202411_AST2500_FLASH = Asset(
>          ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
> -         'images/ast2500-evb/buildroot-2023.11/flash.img'),
> -
> 'c23db6160cf77d0258397eb2051162c8473a56c441417c52a91ba217186e715f'
> )
> +         'images/ast2500-evb/buildroot-2024.11/flash.img'),
> +
> +
> '641e6906c18c0f19a2aeb48099d66d4771929c361001d554d0d45c667413e13a'
> )
> 
>      def test_arm_ast2500_evb_buildroot(self):
>          self.set_machine('ast2500-evb')
> 
> -        image_path = self.ASSET_BR2_202311_AST2500_FLASH.fetch()
> +        image_path = self.ASSET_BR2_202411_AST2500_FLASH.fetch()
> 
>          self.vm.add_args('-device',
> 
> 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
> diff --git a/tests/functional/test_arm_aspeed_ast2600.py
> b/tests/functional/test_arm_aspeed_ast2600.py
> index 21640123ee81..6ae4ed636ac3 100755
> --- a/tests/functional/test_arm_aspeed_ast2600.py
> +++ b/tests/functional/test_arm_aspeed_ast2600.py
> @@ -16,15 +16,15 @@
> 
>  class AST2600Machine(AspeedTest):
> 
> -    ASSET_BR2_202311_AST2600_FLASH = Asset(
> +    ASSET_BR2_202411_AST2600_FLASH = Asset(
>          ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
> -         'images/ast2600-evb/buildroot-2023.11/flash.img'),
> -
> 'b62808daef48b438d0728ee07662290490ecfa65987bb91294cafb1bb7ad1a68'
> )
> +         'images/ast2600-evb/buildroot-2024.11/flash.img'),
> +
> +
> '4bb2f3dfdea31199b51d66b42f686dc5374c144a7346fdc650194a5578b73609')
> 
>      def test_arm_ast2600_evb_buildroot(self):
>          self.set_machine('ast2600-evb')
> 
> -        image_path = self.ASSET_BR2_202311_AST2600_FLASH.fetch()
> +        image_path = self.ASSET_BR2_202411_AST2600_FLASH.fetch()
> 
>          self.vm.add_args('-device',
> 
> 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test');
> --
> 2.48.1

Reviewed-by: Jamin Lin <jamin_lin@aspeedtech.com>

Thanks

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.