Skip to contentSkip to conversation

tests/functional: Update Aspeed OpenBMC images (resend)

PATCH Applied Cédric Le Goater 4 participants 17 messages Jan 29, 2025 – Feb 5, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover tests/functional: Update Aspeed OpenBMC images (resend)

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
Signature · 1 line
2.48.1
#1 lore raw

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

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.

---
 tests/functional/aspeed.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
tests/functional/aspeed.py +18 -0
index b52358bb8c61..51c821944842 100644
@@ -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()
Signature · 1 line
2.48.1
Reviewed-by on v1 1/5
#2 lore raw

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

Quoted 16 lines · 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.

---
  tests/functional/aspeed.py | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
tests/functional/aspeed.py +0 -0
index b52358bb8c61..51c821944842 100644
@@ -23,6 +23,24 @@ def do_test_arm_aspeed(self, machine, image):
          self.wait_for_console_pattern("ftgmac100 1e660000.ethernet eth0: irq ")

tests/functional/aspeed.py def do_test_arm_aspeed(self, machine, image): · line 33

Quoted 10 lines
tests/functional/aspeed.py +8 -0
          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?

tests/functional/aspeed.py def do_test_arm_aspeed(self, machine, image): · line 46

Quoted 13 lines
tests/functional/aspeed.py +10 -0
+        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,

#3 lore raw

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

Quoted 20 lines · Thomas Huth
Quoted 19 lines · 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.

---
  tests/functional/aspeed.py | 18 ++++++++++++++++++

  1 file changed, 18 insertions(+)
tests/functional/aspeed.py +2 -0
index b52358bb8c61..51c821944842 100644
@@ -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'):
Quoted 8 lines

tests/functional/aspeed.py def do_test_arm_aspeed(self, machine, image): · line 33

Quoted 6 lines
tests/functional/aspeed.py +6 -0
+        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.

Quoted 16 lines
Quoted 11 lines
tests/functional/aspeed.py +10 -0
+        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}>.')
+
Quoted 3 lines

      def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
          self.require_netdev('user')
          self.vm.set_console()

Anyway,

Quoted 1 line

Thanks,

C.

#4 lore raw

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

Quoted 30 lines · Cédric Le Goater
Quoted 20 lines · Thomas Huth
Quoted 19 lines · 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.

---
  tests/functional/aspeed.py | 18 ++++++++++++++++++

  1 file changed, 18 insertions(+)
tests/functional/aspeed.py +2 -0
index b52358bb8c61..51c821944842 100644
@@ -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'):
Quoted 8 lines

tests/functional/aspeed.py def do_test_arm_aspeed(self, machine, image): · line 33

Quoted 6 lines
tests/functional/aspeed.py +6 -0
+        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?

Quoted 4 lines

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

#5 lore raw

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

Quoted 31 lines · Thomas Huth
Quoted 30 lines · Cédric Le Goater
Quoted 28 lines · Thomas Huth
Quoted 15 lines · 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.

---
  tests/functional/aspeed.py | 18 ++++++++++++++++++

  1 file changed, 18 insertions(+)
tests/functional/aspeed.py +0 -0
index b52358bb8c61..51c821944842 100644

tests/functional/aspeed.py def do_test_arm_aspeed(self, machine, image): · line 32

Quoted 10 lines
tests/functional/aspeed.py +8 -0
@@ -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?

Quoted 6 lines
Quoted 4 lines

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.

#6 lore raw

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

In reply to Cédric Le Goater

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

---
 tests/functional/test_arm_aspeed_palmetto.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
tests/functional/test_arm_aspeed_palmetto.py +6 -6
index 6588c02aad79..815d05a0e5c9 100755
@@ -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()
Signature · 1 line
2.48.1
Reviewed-by on v1 2/5
#7 lore raw

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

Quoted 21 lines · Cédric Le Goater

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

---
  tests/functional/test_arm_aspeed_palmetto.py | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
tests/functional/test_arm_aspeed_palmetto.py +2 -3
index 6588c02aad79..815d05a0e5c9 100755
@@ -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');

tests/functional/test_arm_aspeed_palmetto.py line 21

Quoted 10 lines
tests/functional/test_arm_aspeed_palmetto.py +4 -3
 
-    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');
#8 lore raw

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

In reply to 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.

---
 tests/functional/aspeed.py                  | 16 ----------------
 tests/functional/test_arm_aspeed_romulus.py | 12 ++++++------
 2 files changed, 6 insertions(+), 22 deletions(-)
tests/functional/aspeed.py +0 -16
index 51c821944842..4b829cfb09ae 100644
@@ -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')
tests/functional/test_arm_aspeed_romulus.py +6 -6
index 747b616201ce..4b223905031b 100755
@@ -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()
Signature · 1 line
2.48.1
Reviewed-by on v1 3/5
#9 lore raw

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

Quoted 9 lines · 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.

---
  tests/functional/aspeed.py                  | 16 ----------------
  tests/functional/test_arm_aspeed_romulus.py | 12 ++++++------
  2 files changed, 6 insertions(+), 22 deletions(-)
#10 lore raw

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

In reply to Cédric Le Goater

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

---
 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
tests/functional/meson.build +2 -0
index b7719ab85f90..5c782ceb0a98 100644
@@ -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',
tests/functional/test_arm_aspeed_witherspoon.py new file +24 -0
new file mode 100755
index 000000000000..12714323733a
@@ -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()
Signature · 1 line
2.48.1
Reviewed-by on v1 4/5
#11 lore raw

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

Quoted 50 lines · Cédric Le Goater

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

---
  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

tests/functional/meson.build +2 -0
index b7719ab85f90..5c782ceb0a98 100644
@@ -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',
tests/functional/test_arm_aspeed_witherspoon.py new file +14 -0
new file mode 100755
index 000000000000..12714323733a
@@ -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');

tests/functional/test_arm_aspeed_witherspoon.py line 24

Quoted 10 lines
tests/functional/test_arm_aspeed_witherspoon.py new file +10 -0
+
+    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()
#12 lore raw

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

In reply to Cédric Le Goater

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

---
 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
tests/functional/meson.build +2 -0
index 5c782ceb0a98..a8eb9c9a7af5 100644
@@ -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',
tests/functional/test_arm_aspeed_bletchley.py new file +24 -0
new file mode 100755
index 000000000000..10e6703b53cb
@@ -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()
Signature · 1 line
2.48.1
Reviewed-by on v1 5/5
#13 lore raw

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

Quoted 50 lines · Cédric Le Goater

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

---
  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

tests/functional/meson.build +2 -0
index 5c782ceb0a98..a8eb9c9a7af5 100644
@@ -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',
tests/functional/test_arm_aspeed_bletchley.py new file +14 -0
new file mode 100755
index 000000000000..10e6703b53cb
@@ -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');

tests/functional/test_arm_aspeed_bletchley.py line 24

Quoted 10 lines
tests/functional/test_arm_aspeed_bletchley.py new file +10 -0
+
+    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()
#15 lore raw

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

Quoted 8 lines · Patrick Williams
Quoted 4 lines · Cédric Le Goater

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

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.

#16 lore raw
In reply to Cédric Le Goater
Quoted 24 lines · 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(-)
Quoted 3 lines

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.