[PATCH 0/5] tests/functional: Update Aspeed OpenBMC images (resend)

[PATCH 0/5] tests/functional: Update Aspeed OpenBMC images (resend)

[Cédric Le Goater]

Hello,

This series updates the OpenBMC firmware images to the latest version
for existing tests and also adds 2 new tests for Aspeed machines which
were not tested before : witherspoon and bletchley.

Thanks,

C.

Cédric Le Goater (5):
  tests/functional: Introduce a new test routine for OpenBMC images
  tests/functional: Update OpenBMC image of palmetto machine
  tests/functional: Update OpenBMC image of romulus machine
  tests/functional: Introduce a witherspoon machine test
  tests/functional: Introduce a bletchley machine test

 tests/functional/aspeed.py                    | 20 +++++++++-------
 tests/functional/meson.build                  |  4 ++++
 tests/functional/test_arm_aspeed_bletchley.py | 24 +++++++++++++++++++
 tests/functional/test_arm_aspeed_palmetto.py  | 12 +++++-----
 tests/functional/test_arm_aspeed_romulus.py   | 12 +++++-----
 .../functional/test_arm_aspeed_witherspoon.py | 24 +++++++++++++++++++
 6 files changed, 75 insertions(+), 21 deletions(-)
 create mode 100755 tests/functional/test_arm_aspeed_bletchley.py
 create mode 100755 tests/functional/test_arm_aspeed_witherspoon.py

-- 
2.48.1

[PATCH 1/5] tests/functional: Introduce a new test routine for OpenBMC images

[Cédric Le Goater]

The OpenBMC images currently used by QEMU to test the Aspeed machines
are rather old. To prepare an update to the latest builds, we need to
adjust the console patterns. Introduce a new routine to preserve the
current tests.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 tests/functional/aspeed.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
index b52358bb8c61..51c821944842 100644
--- a/tests/functional/aspeed.py
+++ b/tests/functional/aspeed.py
@@ -23,6 +23,24 @@ def do_test_arm_aspeed(self, machine, image):
         self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
         self.wait_for_console_pattern("systemd[1]: Set hostname to")
 
+    def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
+                                   cpu_id='0x0', soc='AST2500 rev A1'):
+        hostname = machine.removesuffix('-bmc')
+
+        self.set_machine(machine)
+        self.vm.set_console()
+        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
+                         '-net', 'nic', '-snapshot')
+        self.vm.launch()
+
+        self.wait_for_console_pattern(f'U-Boot {uboot}')
+        self.wait_for_console_pattern('## Loading kernel from FIT Image')
+        self.wait_for_console_pattern('Starting kernel ...')
+        self.wait_for_console_pattern(f'Booting Linux on physical CPU {cpu_id}')
+        self.wait_for_console_pattern(f'ASPEED {soc}')
+        self.wait_for_console_pattern('/init as init process')
+        self.wait_for_console_pattern(f'systemd[1]: Hostname set to <{hostname}>.')
+
     def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
         self.require_netdev('user')
         self.vm.set_console()
-- 
2.48.1

Re: [PATCH 1/5] tests/functional: Introduce a new test routine for OpenBMC images

[Thomas Huth]

On 29/01/2025 08.18, Cédric Le Goater wrote:
> The OpenBMC images currently used by QEMU to test the Aspeed machines
> are rather old. To prepare an update to the latest builds, we need to
> adjust the console patterns. Introduce a new routine to preserve the
> current tests.
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>   tests/functional/aspeed.py | 18 ++++++++++++++++++
>   1 file changed, 18 insertions(+)
> 
> diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
> index b52358bb8c61..51c821944842 100644
> --- a/tests/functional/aspeed.py
> +++ b/tests/functional/aspeed.py
> @@ -23,6 +23,24 @@ def do_test_arm_aspeed(self, machine, image):
>           self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
>           self.wait_for_console_pattern("systemd[1]: Set hostname to")
>   
> +    def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
> +                                   cpu_id='0x0', soc='AST2500 rev A1'):
> +        hostname = machine.removesuffix('-bmc')
> +
> +        self.set_machine(machine)
> +        self.vm.set_console()
> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
> +                         '-net', 'nic', '-snapshot')

"-net nic" is the default anyway, so unless you also use "-nodefaults", I 
think you can simply drop that?

> +        self.vm.launch()
> +
> +        self.wait_for_console_pattern(f'U-Boot {uboot}')
> +        self.wait_for_console_pattern('## Loading kernel from FIT Image')
> +        self.wait_for_console_pattern('Starting kernel ...')
> +        self.wait_for_console_pattern(f'Booting Linux on physical CPU {cpu_id}')
> +        self.wait_for_console_pattern(f'ASPEED {soc}')
> +        self.wait_for_console_pattern('/init as init process')
> +        self.wait_for_console_pattern(f'systemd[1]: Hostname set to <{hostname}>.')
> +
>       def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
>           self.require_netdev('user')
>           self.vm.set_console()

Anyway,
Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 1/5] tests/functional: Introduce a new test routine for OpenBMC images

[Cédric Le Goater]

On 1/29/25 08:58, Thomas Huth wrote:
> On 29/01/2025 08.18, Cédric Le Goater wrote:
>> The OpenBMC images currently used by QEMU to test the Aspeed machines
>> are rather old. To prepare an update to the latest builds, we need to
>> adjust the console patterns. Introduce a new routine to preserve the
>> current tests.
>>
>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>> ---
>>   tests/functional/aspeed.py | 18 ++++++++++++++++++
>>   1 file changed, 18 insertions(+)
>>
>> diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
>> index b52358bb8c61..51c821944842 100644
>> --- a/tests/functional/aspeed.py
>> +++ b/tests/functional/aspeed.py
>> @@ -23,6 +23,24 @@ def do_test_arm_aspeed(self, machine, image):
>>           self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
>>           self.wait_for_console_pattern("systemd[1]: Set hostname to")
>> +    def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
>> +                                   cpu_id='0x0', soc='AST2500 rev A1'):
>> +        hostname = machine.removesuffix('-bmc')
>> +
>> +        self.set_machine(machine)
>> +        self.vm.set_console()
>> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
>> +                         '-net', 'nic', '-snapshot')
> 
> "-net nic" is the default anyway, so unless you also use "-nodefaults", I think you can simply drop that?

OK. Will do.

Do you want a resend for that ? Unless you prefer this series
to go through you tree, I will amend before sending PR.


> 
>> +        self.vm.launch()
>> +
>> +        self.wait_for_console_pattern(f'U-Boot {uboot}')
>> +        self.wait_for_console_pattern('## Loading kernel from FIT Image')
>> +        self.wait_for_console_pattern('Starting kernel ...')
>> +        self.wait_for_console_pattern(f'Booting Linux on physical CPU {cpu_id}')
>> +        self.wait_for_console_pattern(f'ASPEED {soc}')
>> +        self.wait_for_console_pattern('/init as init process')
>> +        self.wait_for_console_pattern(f'systemd[1]: Hostname set to <{hostname}>.')
>> +
>>       def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
>>           self.require_netdev('user')
>>           self.vm.set_console()
> 
> Anyway,
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Thanks,

C.

Re: [PATCH 1/5] tests/functional: Introduce a new test routine for OpenBMC images

[Thomas Huth]

On 29/01/2025 17.28, Cédric Le Goater wrote:
> On 1/29/25 08:58, Thomas Huth wrote:
>> On 29/01/2025 08.18, Cédric Le Goater wrote:
>>> The OpenBMC images currently used by QEMU to test the Aspeed machines
>>> are rather old. To prepare an update to the latest builds, we need to
>>> adjust the console patterns. Introduce a new routine to preserve the
>>> current tests.
>>>
>>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>>> ---
>>>   tests/functional/aspeed.py | 18 ++++++++++++++++++
>>>   1 file changed, 18 insertions(+)
>>>
>>> diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
>>> index b52358bb8c61..51c821944842 100644
>>> --- a/tests/functional/aspeed.py
>>> +++ b/tests/functional/aspeed.py
>>> @@ -23,6 +23,24 @@ def do_test_arm_aspeed(self, machine, image):
>>>           self.wait_for_console_pattern("ftgmac100 1e660000.ethernet 
>>> eth0: irq ")
>>>           self.wait_for_console_pattern("systemd[1]: Set hostname to")
>>> +    def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
>>> +                                   cpu_id='0x0', soc='AST2500 rev A1'):
>>> +        hostname = machine.removesuffix('-bmc')
>>> +
>>> +        self.set_machine(machine)
>>> +        self.vm.set_console()
>>> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
>>> +                         '-net', 'nic', '-snapshot')
>>
>> "-net nic" is the default anyway, so unless you also use "-nodefaults", I 
>> think you can simply drop that?
> 
> OK. Will do.
> 
> Do you want a resend for that ? Unless you prefer this series
> to go through you tree, I will amend before sending PR.

No, no need for a v2 just because of this. And yes, please take it through 
the aspeed tree!

  Thanks,
   Thomas

Re: [PATCH 1/5] tests/functional: Introduce a new test routine for OpenBMC images

[Cédric Le Goater]

On 1/30/25 07:40, Thomas Huth wrote:
> On 29/01/2025 17.28, Cédric Le Goater wrote:
>> On 1/29/25 08:58, Thomas Huth wrote:
>>> On 29/01/2025 08.18, Cédric Le Goater wrote:
>>>> The OpenBMC images currently used by QEMU to test the Aspeed machines
>>>> are rather old. To prepare an update to the latest builds, we need to
>>>> adjust the console patterns. Introduce a new routine to preserve the
>>>> current tests.
>>>>
>>>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>>>> ---
>>>>   tests/functional/aspeed.py | 18 ++++++++++++++++++
>>>>   1 file changed, 18 insertions(+)
>>>>
>>>> diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
>>>> index b52358bb8c61..51c821944842 100644
>>>> --- a/tests/functional/aspeed.py
>>>> +++ b/tests/functional/aspeed.py
>>>> @@ -23,6 +23,24 @@ def do_test_arm_aspeed(self, machine, image):
>>>>           self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
>>>>           self.wait_for_console_pattern("systemd[1]: Set hostname to")
>>>> +    def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
>>>> +                                   cpu_id='0x0', soc='AST2500 rev A1'):
>>>> +        hostname = machine.removesuffix('-bmc')
>>>> +
>>>> +        self.set_machine(machine)
>>>> +        self.vm.set_console()
>>>> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
>>>> +                         '-net', 'nic', '-snapshot')
>>>
>>> "-net nic" is the default anyway, so unless you also use "-nodefaults", I think you can simply drop that?
>>
>> OK. Will do.
>>
>> Do you want a resend for that ? Unless you prefer this series
>> to go through you tree, I will amend before sending PR.
> 
> No, no need for a v2 just because of this. And yes, please take it through the aspeed tree!


OK. I also added the extra 2 empty lines between the imports and
the class statements in the tests being modified.


Thanks,

C.

[PATCH 2/5] tests/functional: Update OpenBMC image of palmetto machine

[Cédric Le Goater]

Use the new do_test_arm_aspeed_openbmc() routine to run the latest
OpenBMC firmware build of the palmetto BMC.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 tests/functional/test_arm_aspeed_palmetto.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/functional/test_arm_aspeed_palmetto.py b/tests/functional/test_arm_aspeed_palmetto.py
index 6588c02aad79..815d05a0e5c9 100755
--- a/tests/functional/test_arm_aspeed_palmetto.py
+++ b/tests/functional/test_arm_aspeed_palmetto.py
@@ -10,15 +10,15 @@
 class PalmettoMachine(AspeedTest):
 
     ASSET_PALMETTO_FLASH = Asset(
-        ('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
-         'obmc-phosphor-image-palmetto.static.mtd'),
-        '3e13bbbc28e424865dc42f35ad672b10f2e82cdb11846bb28fa625b48beafd0d');
+        'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/palmetto-bmc/openbmc-20250128071432/obmc-phosphor-image-palmetto-20250128071432.static.mtd',
+        'bce7c392eec75c707a91cfc8fad7ca9a69d7e4f10df936930d65c1cb9897ac81');
 
-    def test_arm_ast2400_palmetto_openbmc_v2_9_0(self):
+    def test_arm_ast2400_palmetto_openbmc(self):
         image_path = self.ASSET_PALMETTO_FLASH.fetch()
 
-        self.do_test_arm_aspeed('palmetto-bmc', image_path)
-
+        self.do_test_arm_aspeed_openbmc('palmetto-bmc', image=image_path,
+                                        uboot='2019.04', cpu_id='0x0',
+                                        soc='AST2400 rev A1');
 
 if __name__ == '__main__':
     AspeedTest.main()
-- 
2.48.1

Re: [PATCH 2/5] tests/functional: Update OpenBMC image of palmetto machine

[Thomas Huth]

On 29/01/2025 08.18, Cédric Le Goater wrote:
> Use the new do_test_arm_aspeed_openbmc() routine to run the latest
> OpenBMC firmware build of the palmetto BMC.
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>   tests/functional/test_arm_aspeed_palmetto.py | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/functional/test_arm_aspeed_palmetto.py b/tests/functional/test_arm_aspeed_palmetto.py
> index 6588c02aad79..815d05a0e5c9 100755
> --- a/tests/functional/test_arm_aspeed_palmetto.py
> +++ b/tests/functional/test_arm_aspeed_palmetto.py
> @@ -10,15 +10,15 @@
>   class PalmettoMachine(AspeedTest):
>   
>       ASSET_PALMETTO_FLASH = Asset(
> -        ('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
> -         'obmc-phosphor-image-palmetto.static.mtd'),
> -        '3e13bbbc28e424865dc42f35ad672b10f2e82cdb11846bb28fa625b48beafd0d');
> +        'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/palmetto-bmc/openbmc-20250128071432/obmc-phosphor-image-palmetto-20250128071432.static.mtd',
> +        'bce7c392eec75c707a91cfc8fad7ca9a69d7e4f10df936930d65c1cb9897ac81');
>   
> -    def test_arm_ast2400_palmetto_openbmc_v2_9_0(self):
> +    def test_arm_ast2400_palmetto_openbmc(self):
>           image_path = self.ASSET_PALMETTO_FLASH.fetch()
>   
> -        self.do_test_arm_aspeed('palmetto-bmc', image_path)
> -
> +        self.do_test_arm_aspeed_openbmc('palmetto-bmc', image=image_path,
> +                                        uboot='2019.04', cpu_id='0x0',
> +                                        soc='AST2400 rev A1');

Reviewed-by: Thomas Huth <thuth@redhat.com>

[PATCH 3/5] tests/functional: Update OpenBMC image of romulus machine

[Cédric Le Goater]

Use the new do_test_arm_aspeed_openbmc() routine to run the latest
OpenBMC firmware build of the romulus BMC. Remove the older routine
which is now unused.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 tests/functional/aspeed.py                  | 16 ----------------
 tests/functional/test_arm_aspeed_romulus.py | 12 ++++++------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
index 51c821944842..4b829cfb09ae 100644
--- a/tests/functional/aspeed.py
+++ b/tests/functional/aspeed.py
@@ -7,22 +7,6 @@
 
 class AspeedTest(LinuxKernelTest):
 
-    def do_test_arm_aspeed(self, machine, image):
-        self.set_machine(machine)
-        self.vm.set_console()
-        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
-                         '-net', 'nic', '-snapshot')
-        self.vm.launch()
-
-        self.wait_for_console_pattern("U-Boot 2016.07")
-        self.wait_for_console_pattern("## Loading kernel from FIT Image at 20080000")
-        self.wait_for_console_pattern("Starting kernel ...")
-        self.wait_for_console_pattern("Booting Linux on physical CPU 0x0")
-        self.wait_for_console_pattern(
-                "aspeed-smc 1e620000.spi: read control register: 203b0641")
-        self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")
-        self.wait_for_console_pattern("systemd[1]: Set hostname to")
-
     def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
                                    cpu_id='0x0', soc='AST2500 rev A1'):
         hostname = machine.removesuffix('-bmc')
diff --git a/tests/functional/test_arm_aspeed_romulus.py b/tests/functional/test_arm_aspeed_romulus.py
index 747b616201ce..4b223905031b 100755
--- a/tests/functional/test_arm_aspeed_romulus.py
+++ b/tests/functional/test_arm_aspeed_romulus.py
@@ -10,15 +10,15 @@
 class RomulusMachine(AspeedTest):
 
     ASSET_ROMULUS_FLASH = Asset(
-        ('https://github.com/openbmc/openbmc/releases/download/2.9.0/'
-         'obmc-phosphor-image-romulus.static.mtd'),
-        '820341076803f1955bc31e647a512c79f9add4f5233d0697678bab4604c7bb25')
+        'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/romulus-bmc/openbmc-20250128071340/obmc-phosphor-image-romulus-20250128071340.static.mtd',
+        '6d031376440c82ed9d087d25e9fa76aea75b42f80daa252ec402c0bc3cf6cf5b');
 
-    def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
+    def test_arm_ast2500_romulus_openbmc(self):
         image_path = self.ASSET_ROMULUS_FLASH.fetch()
 
-        self.do_test_arm_aspeed('romulus-bmc', image_path)
-
+        self.do_test_arm_aspeed_openbmc('romulus-bmc', image=image_path,
+                                        uboot='2019.04', cpu_id='0x0',
+                                        soc='AST2500 rev A1');
 
 if __name__ == '__main__':
     AspeedTest.main()
-- 
2.48.1

Re: [PATCH 3/5] tests/functional: Update OpenBMC image of romulus machine

[Thomas Huth]

On 29/01/2025 08.18, Cédric Le Goater wrote:
> Use the new do_test_arm_aspeed_openbmc() routine to run the latest
> OpenBMC firmware build of the romulus BMC. Remove the older routine
> which is now unused.
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>   tests/functional/aspeed.py                  | 16 ----------------
>   tests/functional/test_arm_aspeed_romulus.py | 12 ++++++------
>   2 files changed, 6 insertions(+), 22 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[PATCH 4/5] tests/functional: Introduce a witherspoon machine test

[Cédric Le Goater]

Use do_test_arm_aspeed_openbmc() routine to run the latest OpenBMC
firmware build of the witherspoon BMC.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 tests/functional/meson.build                  |  2 ++
 .../functional/test_arm_aspeed_witherspoon.py | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100755 tests/functional/test_arm_aspeed_witherspoon.py

diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index b7719ab85f90..5c782ceb0a98 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -22,6 +22,7 @@ test_timeouts = {
   'acpi_bits' : 420,
   'arm_aspeed_palmetto' : 120,
   'arm_aspeed_romulus' : 120,
+  'arm_aspeed_witherspoon' : 120,
   'arm_aspeed_ast2500' : 480,
   'arm_aspeed_ast2600' : 720,
   'arm_aspeed_rainier' : 240,
@@ -82,6 +83,7 @@ tests_arm_system_thorough = [
   'arm_aspeed_ast1030',
   'arm_aspeed_palmetto',
   'arm_aspeed_romulus',
+  'arm_aspeed_witherspoon',
   'arm_aspeed_ast2500',
   'arm_aspeed_ast2600',
   'arm_aspeed_rainier',
diff --git a/tests/functional/test_arm_aspeed_witherspoon.py b/tests/functional/test_arm_aspeed_witherspoon.py
new file mode 100755
index 000000000000..12714323733a
--- /dev/null
+++ b/tests/functional/test_arm_aspeed_witherspoon.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+#
+# Functional test that boots the ASPEED machines
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import Asset
+from aspeed import AspeedTest
+
+class WitherspoonMachine(AspeedTest):
+
+    ASSET_WITHERSPOON_FLASH = Asset(
+        'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/witherspoon-bmc/openbmc-20240618035022/obmc-phosphor-image-witherspoon-20240618035022.ubi.mtd',
+        '937d9ed449ea6c6cbed983519088a42d0cafe276bcfe4fce07772ca6673f9213');
+
+    def test_arm_ast2500_witherspoon_openbmc(self):
+        image_path = self.ASSET_WITHERSPOON_FLASH.fetch()
+
+        self.do_test_arm_aspeed_openbmc('witherspoon-bmc', image=image_path,
+                                        uboot='2016.07', cpu_id='0x0',
+                                        soc='AST2500 rev A1');
+
+if __name__ == '__main__':
+    AspeedTest.main()
-- 
2.48.1

Re: [PATCH 4/5] tests/functional: Introduce a witherspoon machine test

[Thomas Huth]

On 29/01/2025 08.18, Cédric Le Goater wrote:
> Use do_test_arm_aspeed_openbmc() routine to run the latest OpenBMC
> firmware build of the witherspoon BMC.
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>   tests/functional/meson.build                  |  2 ++
>   .../functional/test_arm_aspeed_witherspoon.py | 24 +++++++++++++++++++
>   2 files changed, 26 insertions(+)
>   create mode 100755 tests/functional/test_arm_aspeed_witherspoon.py
> 
> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
> index b7719ab85f90..5c782ceb0a98 100644
> --- a/tests/functional/meson.build
> +++ b/tests/functional/meson.build
> @@ -22,6 +22,7 @@ test_timeouts = {
>     'acpi_bits' : 420,
>     'arm_aspeed_palmetto' : 120,
>     'arm_aspeed_romulus' : 120,
> +  'arm_aspeed_witherspoon' : 120,
>     'arm_aspeed_ast2500' : 480,
>     'arm_aspeed_ast2600' : 720,
>     'arm_aspeed_rainier' : 240,
> @@ -82,6 +83,7 @@ tests_arm_system_thorough = [
>     'arm_aspeed_ast1030',
>     'arm_aspeed_palmetto',
>     'arm_aspeed_romulus',
> +  'arm_aspeed_witherspoon',
>     'arm_aspeed_ast2500',
>     'arm_aspeed_ast2600',
>     'arm_aspeed_rainier',
> diff --git a/tests/functional/test_arm_aspeed_witherspoon.py b/tests/functional/test_arm_aspeed_witherspoon.py
> new file mode 100755
> index 000000000000..12714323733a
> --- /dev/null
> +++ b/tests/functional/test_arm_aspeed_witherspoon.py
> @@ -0,0 +1,24 @@
> +#!/usr/bin/env python3
> +#
> +# Functional test that boots the ASPEED machines
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +
> +from qemu_test import Asset
> +from aspeed import AspeedTest
> +
> +class WitherspoonMachine(AspeedTest):
> +
> +    ASSET_WITHERSPOON_FLASH = Asset(
> +        'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/witherspoon-bmc/openbmc-20240618035022/obmc-phosphor-image-witherspoon-20240618035022.ubi.mtd',
> +        '937d9ed449ea6c6cbed983519088a42d0cafe276bcfe4fce07772ca6673f9213');
> +
> +    def test_arm_ast2500_witherspoon_openbmc(self):
> +        image_path = self.ASSET_WITHERSPOON_FLASH.fetch()
> +
> +        self.do_test_arm_aspeed_openbmc('witherspoon-bmc', image=image_path,
> +                                        uboot='2016.07', cpu_id='0x0',
> +                                        soc='AST2500 rev A1');
> +
> +if __name__ == '__main__':
> +    AspeedTest.main()

Reviewed-by: Thomas Huth <thuth@redhat.com>

[PATCH 5/5] tests/functional: Introduce a bletchley machine test

[Cédric Le Goater]

Use do_test_arm_aspeed_openbmc() to run the latest OpenBMC firmware
build of the bletchley BMC.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 tests/functional/meson.build                  |  2 ++
 tests/functional/test_arm_aspeed_bletchley.py | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100755 tests/functional/test_arm_aspeed_bletchley.py

diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 5c782ceb0a98..a8eb9c9a7af5 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -25,6 +25,7 @@ test_timeouts = {
   'arm_aspeed_witherspoon' : 120,
   'arm_aspeed_ast2500' : 480,
   'arm_aspeed_ast2600' : 720,
+  'arm_aspeed_bletchley' : 120,
   'arm_aspeed_rainier' : 240,
   'arm_bpim2u' : 500,
   'arm_collie' : 180,
@@ -86,6 +87,7 @@ tests_arm_system_thorough = [
   'arm_aspeed_witherspoon',
   'arm_aspeed_ast2500',
   'arm_aspeed_ast2600',
+  'arm_aspeed_bletchley',
   'arm_aspeed_rainier',
   'arm_bpim2u',
   'arm_canona1100',
diff --git a/tests/functional/test_arm_aspeed_bletchley.py b/tests/functional/test_arm_aspeed_bletchley.py
new file mode 100755
index 000000000000..10e6703b53cb
--- /dev/null
+++ b/tests/functional/test_arm_aspeed_bletchley.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+#
+# Functional test that boots the ASPEED machines
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import Asset
+from aspeed import AspeedTest
+
+class BletchleyMachine(AspeedTest):
+
+    ASSET_BLETCHLEY_FLASH = Asset(
+        'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/bletchley-bmc/openbmc-20250128071329/obmc-phosphor-image-bletchley-20250128071329.static.mtd.xz',
+        'db21d04d47d7bb2a276f59d308614b4dfb70b9c7c81facbbca40a3977a2d8844');
+
+    def test_arm_ast2600_bletchley_openbmc(self):
+        image_path = self.uncompress(self.ASSET_BLETCHLEY_FLASH)
+
+        self.do_test_arm_aspeed_openbmc('bletchley-bmc', image=image_path,
+                                        uboot='2019.04', cpu_id='0xf00',
+                                        soc='AST2600 rev A3');
+
+if __name__ == '__main__':
+    AspeedTest.main()
-- 
2.48.1

Re: [PATCH 5/5] tests/functional: Introduce a bletchley machine test

[Thomas Huth]

On 29/01/2025 08.18, Cédric Le Goater wrote:
> Use do_test_arm_aspeed_openbmc() to run the latest OpenBMC firmware
> build of the bletchley BMC.
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>   tests/functional/meson.build                  |  2 ++
>   tests/functional/test_arm_aspeed_bletchley.py | 24 +++++++++++++++++++
>   2 files changed, 26 insertions(+)
>   create mode 100755 tests/functional/test_arm_aspeed_bletchley.py
> 
> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
> index 5c782ceb0a98..a8eb9c9a7af5 100644
> --- a/tests/functional/meson.build
> +++ b/tests/functional/meson.build
> @@ -25,6 +25,7 @@ test_timeouts = {
>     'arm_aspeed_witherspoon' : 120,
>     'arm_aspeed_ast2500' : 480,
>     'arm_aspeed_ast2600' : 720,
> +  'arm_aspeed_bletchley' : 120,
>     'arm_aspeed_rainier' : 240,
>     'arm_bpim2u' : 500,
>     'arm_collie' : 180,
> @@ -86,6 +87,7 @@ tests_arm_system_thorough = [
>     'arm_aspeed_witherspoon',
>     'arm_aspeed_ast2500',
>     'arm_aspeed_ast2600',
> +  'arm_aspeed_bletchley',
>     'arm_aspeed_rainier',
>     'arm_bpim2u',
>     'arm_canona1100',
> diff --git a/tests/functional/test_arm_aspeed_bletchley.py b/tests/functional/test_arm_aspeed_bletchley.py
> new file mode 100755
> index 000000000000..10e6703b53cb
> --- /dev/null
> +++ b/tests/functional/test_arm_aspeed_bletchley.py
> @@ -0,0 +1,24 @@
> +#!/usr/bin/env python3
> +#
> +# Functional test that boots the ASPEED machines
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +
> +from qemu_test import Asset
> +from aspeed import AspeedTest
> +
> +class BletchleyMachine(AspeedTest):
> +
> +    ASSET_BLETCHLEY_FLASH = Asset(
> +        'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/bletchley-bmc/openbmc-20250128071329/obmc-phosphor-image-bletchley-20250128071329.static.mtd.xz',
> +        'db21d04d47d7bb2a276f59d308614b4dfb70b9c7c81facbbca40a3977a2d8844');
> +
> +    def test_arm_ast2600_bletchley_openbmc(self):
> +        image_path = self.uncompress(self.ASSET_BLETCHLEY_FLASH)
> +
> +        self.do_test_arm_aspeed_openbmc('bletchley-bmc', image=image_path,
> +                                        uboot='2019.04', cpu_id='0xf00',
> +                                        soc='AST2600 rev A3');
> +
> +if __name__ == '__main__':
> +    AspeedTest.main()

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 5/5] tests/functional: Introduce a bletchley machine test

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

On Wed, Jan 29, 2025 at 08:18:20AM +0100, Cédric Le Goater wrote:
> Use do_test_arm_aspeed_openbmc() to run the latest OpenBMC firmware
> build of the bletchley BMC.
> 
> Signed-off-by: Cédric Le Goater <clg@redhat.com>

Reviewed-by: Patrick Williams <patrick@stwcx.xyz>

-- 
Patrick Williams

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 5/5] tests/functional: Introduce a bletchley machine test

[Cédric Le Goater]

On 1/31/25 12:22, Patrick Williams wrote:
> On Wed, Jan 29, 2025 at 08:18:20AM +0100, Cédric Le Goater wrote:
>> Use do_test_arm_aspeed_openbmc() to run the latest OpenBMC firmware
>> build of the bletchley BMC.
>>
>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> 
> Reviewed-by: Patrick Williams <patrick@stwcx.xyz>
> 


Patrick,

Would it be possible to keep successful openbmc builds from

   https://jenkins.openbmc.org/job/ci-openbmc/

somewhere ?

As assets under :

   https://github.com/openbmc/openbmc/releases

May be ?

Thanks,

C.

Re: [PATCH 0/5] tests/functional: Update Aspeed OpenBMC images (resend)

[Cédric Le Goater]

On 1/29/25 08:18, Cédric Le Goater wrote:
> Hello,
> 
> This series updates the OpenBMC firmware images to the latest version
> for existing tests and also adds 2 new tests for Aspeed machines which
> were not tested before : witherspoon and bletchley.
> 
> Thanks,
> 
> C.
> 
> Cédric Le Goater (5):
>    tests/functional: Introduce a new test routine for OpenBMC images
>    tests/functional: Update OpenBMC image of palmetto machine
>    tests/functional: Update OpenBMC image of romulus machine
>    tests/functional: Introduce a witherspoon machine test
>    tests/functional: Introduce a bletchley machine test
> 
>   tests/functional/aspeed.py                    | 20 +++++++++-------
>   tests/functional/meson.build                  |  4 ++++
>   tests/functional/test_arm_aspeed_bletchley.py | 24 +++++++++++++++++++
>   tests/functional/test_arm_aspeed_palmetto.py  | 12 +++++-----
>   tests/functional/test_arm_aspeed_romulus.py   | 12 +++++-----
>   .../functional/test_arm_aspeed_witherspoon.py | 24 +++++++++++++++++++
>   6 files changed, 75 insertions(+), 21 deletions(-)
>   create mode 100755 tests/functional/test_arm_aspeed_bletchley.py
>   create mode 100755 tests/functional/test_arm_aspeed_witherspoon.py
> 


Applied to aspeed-next.

Thanks,

C.