Skip to contentSkip to conversation

tests/acceptance: Test powernv machines

PATCH Superseded Cédric Le Goater 6 participants 8 messages Aug 10, 2021 – Aug 16, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/acceptance: Test powernv machines

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>
---
 tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +42 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):
         tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
         self.do_test_advcal_2018('19', tar_hash, 'uImage')
 
+    def do_test_ppc64_powernv(self, proc):
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')
+
+        kernel_url = images_url + 'zImage.epapr'
+        kernel_hash = '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash,
+                                       algorithm='sha256')
+        self.vm.set_console()
+        self.vm.add_args('-bios', skiboot_path,
+                         '-kernel', kernel_path,
+                         '-append', 'console=tty0 console=hvc0',
+                         '-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
+                         '-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
+                         '-device', 'e1000e,bus=bridge1,addr=0x3',
+                         '-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
+        self.vm.launch()
+
+        self.wait_for_console_pattern("CPU: " + proc + " generation processor")
+        self.wait_for_console_pattern("zImage starting: loaded")
+        self.wait_for_console_pattern("Run /init as init process")
+        self.wait_for_console_pattern("Creating 1 MTD partitions")
+
+    def test_ppc_powernv8(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:powernv8
+        """
+        self.do_test_ppc64_powernv('P8')
+
+    def test_ppc_powernv9(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:powernv9
+        """
+        self.do_test_ppc64_powernv('P9')
+
     def test_ppc_g3beige(self):
         """
         :avocado: tags=arch:ppc
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 17 lines · Cédric Le Goater

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>
---
 tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +0 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):
         tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1186

Quoted 10 lines
tests/acceptance/boot_linux_console.py +8 -0
         self.do_test_advcal_2018('19', tar_hash, 'uImage')
 
+    def do_test_ppc64_powernv(self, proc):
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')

What's the thought that led you to using this instead of the one that gets packaged with qemu?

Quoted 9 lines
tests/acceptance/boot_linux_console.py +9 -0
+
+        kernel_url = images_url + 'zImage.epapr'
+        kernel_hash = '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash,
+                                       algorithm='sha256')
+        self.vm.set_console()
+        self.vm.add_args('-bios', skiboot_path,
+                         '-kernel', kernel_path,
+                         '-append', 'console=tty0 console=hvc0',

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1205

Quoted 10 lines
tests/acceptance/boot_linux_console.py +10 -0
+                         '-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
+                         '-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
+                         '-device', 'e1000e,bus=bridge1,addr=0x3',
+                         '-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
+        self.vm.launch()
+
+        self.wait_for_console_pattern("CPU: " + proc + " generation processor")
+        self.wait_for_console_pattern("zImage starting: loaded")
+        self.wait_for_console_pattern("Run /init as init process")
+        self.wait_for_console_pattern("Creating 1 MTD partitions")

This is great.

Is there any value in checking for some of the devices that come up, like USB or ethernet?

Quoted 21 lines
tests/acceptance/boot_linux_console.py +15 -1
+
+    def test_ppc_powernv8(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:powernv8
+        """
+        self.do_test_ppc64_powernv('P8')
+
+    def test_ppc_powernv9(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:powernv9
+        """
+        self.do_test_ppc64_powernv('P9')
+
     def test_ppc_g3beige(self):
         """
         :avocado: tags=arch:ppc
--

2.31.1

#2 lore raw
Quoted 20 lines · Joel Stanley
Quoted 19 lines · Cédric Le Goater

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>
---
 tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +0 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):
         tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
         self.do_test_advcal_2018('19', tar_hash, 'uImage')
 
Quoted 11 lines

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1186

Quoted 8 lines
tests/acceptance/boot_linux_console.py +8 -0
+    def do_test_ppc64_powernv(self, proc):
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')

What's the thought that led you to using this instead of the one that gets packaged with qemu?

Good question.

I considered that the skiboot.lid shipped with QEMU was somewhat a default to make things work. The official released versions are the ones used by the outside world on real systems and were a better target for tests.

That said, using the default version might be enough. Maintainers, please advise !

Quoted 22 lines
Quoted 9 lines
tests/acceptance/boot_linux_console.py +9 -0
+
+        kernel_url = images_url + 'zImage.epapr'
+        kernel_hash = '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash,
+                                       algorithm='sha256')
+        self.vm.set_console()
+        self.vm.add_args('-bios', skiboot_path,
+                         '-kernel', kernel_path,
+                         '-append', 'console=tty0 console=hvc0',

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1205

Quoted 10 lines
tests/acceptance/boot_linux_console.py +10 -0
+                         '-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
+                         '-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
+                         '-device', 'e1000e,bus=bridge1,addr=0x3',
+                         '-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
+        self.vm.launch()
+
+        self.wait_for_console_pattern("CPU: " + proc + " generation processor")
+        self.wait_for_console_pattern("zImage starting: loaded")
+        self.wait_for_console_pattern("Run /init as init process")
+        self.wait_for_console_pattern("Creating 1 MTD partitions")

This is great.

Quoted 2 lines

Is there any value in checking for some of the devices that come up, like USB or ethernet?

or nvme. Yes. That's a good idea.

Quoted 1 line

Thanks,

C.

Quoted 22 lines
Quoted 22 lines
tests/acceptance/boot_linux_console.py +15 -1
+
+    def test_ppc_powernv8(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:powernv8
+        """
+        self.do_test_ppc64_powernv('P8')
+
+    def test_ppc_powernv9(self):
+        """
+        :avocado: tags=arch:ppc64
+        :avocado: tags=machine:powernv9
+        """
+        self.do_test_ppc64_powernv('P9')
+
     def test_ppc_g3beige(self):
         """
         :avocado: tags=arch:ppc
--

2.31.1

#3 lore raw
Quoted 33 lines · Cédric Le Goater
Quoted 20 lines · Joel Stanley
Quoted 19 lines · Cédric Le Goater

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>
---
  tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +0 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):
          tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
          self.do_test_advcal_2018('19', tar_hash, 'uImage')
 
Quoted 11 lines

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1186

Quoted 8 lines
tests/acceptance/boot_linux_console.py +8 -0
+    def do_test_ppc64_powernv(self, proc):
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')

What's the thought that led you to using this instead of the one that gets packaged with qemu?

Quoted 8 lines

Good question.

I considered that the skiboot.lid shipped with QEMU was somewhat a default to make things work. The official released versions are the ones used by the outside world on real systems and were a better target for tests.

That said, using the default version might be enough. Maintainers, please advise !

IMHO:

- We want to test the things that *we* ship

- We want to download as few things as possible, since downloads often slow down the tests and break CI runs if the network to the download site is not available

==> I'd prefer to use the internal skiboot.lid unless there is
really a compelling reason to use the external one.

Just my 0.02 € though.

Thomas

#4 lore raw
Quoted 45 lines · Thomas Huth
Quoted 33 lines · Cédric Le Goater
Quoted 20 lines · Joel Stanley
Quoted 19 lines · Cédric Le Goater

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>

---
  tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++

  1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +0 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):

          tar_hash = '6951d86d644b302898da2fd701739c9406527fe1' self.do_test_advcal_2018('19', tar_hash, 'uImage')

Quoted 11 lines

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1186

Quoted 8 lines

+    def do_test_ppc64_powernv(self, proc):

tests/acceptance/boot_linux_console.py +7 -0
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')

What's the thought that led you to using this instead of the one that gets packaged with qemu?

Quoted 8 lines

Good question.

I considered that the skiboot.lid shipped with QEMU was somewhat a default to make things work. The official released versions are the ones used by the outside world on real systems and were a better target for tests.

That said, using the default version might be enough. Maintainers, please advise !

IMHO:

Quoted 8 lines

- We want to test the things that *we* ship

- We want to download as few things as possible, since downloads often slow down the tests and break CI runs if the network to the download site is not available

 ==> I'd prefer to use the internal skiboot.lid unless there is really a compelling reason to use the external one.

OK. I changed the test to use the internal skiboot.lid.

Thanks,

C.

#5 lore raw

Hi Cédric,

Quoted 44 lines · Cédric Le Goater
Quoted 43 lines · Thomas Huth
Quoted 30 lines · Cédric Le Goater
Quoted 19 lines · Joel Stanley
Quoted 18 lines · Cédric Le Goater

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>
---
   tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++
   1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +0 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):
           tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
           self.do_test_advcal_2018('19', tar_hash, 'uImage')
 
Quoted 10 lines

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1186

Quoted 8 lines
tests/acceptance/boot_linux_console.py +8 -0
+    def do_test_ppc64_powernv(self, proc):
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')

What's the thought that led you to using this instead of the one that gets packaged with qemu?

Quoted 8 lines

Good question.

I considered that the skiboot.lid shipped with QEMU was somewhat a default to make things work. The official released versions are the ones used by the outside world on real systems and were a better target for tests.

That said, using the default version might be enough. Maintainers, please advise !

IMHO:

- We want to test the things that *we* ship

Quoted 7 lines
Quoted 6 lines

- We want to download as few things as possible, since downloads often slow down the tests and break CI runs if the network to the download site is not available

 ==> I'd prefer to use the internal skiboot.lid unless there is really a compelling reason to use the external one.

OK. I changed the test to use the internal skiboot.lid.

The code of patch v1 looks good to me but I will wait the v2 to put my reviewed-by stamp.

Thanks!

- Wainer

Quoted 9 lines

Thanks,

C.

#6 lore raw
In reply to Thomas Huth
Quoted 47 lines · Thomas Huth
Quoted 33 lines · Cédric Le Goater
Quoted 20 lines · Joel Stanley
Quoted 19 lines · Cédric Le Goater

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>
---
  tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +0 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):
          tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
          self.do_test_advcal_2018('19', tar_hash, 'uImage')
 
Quoted 11 lines

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1186

Quoted 8 lines
tests/acceptance/boot_linux_console.py +8 -0
+    def do_test_ppc64_powernv(self, proc):
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')

What's the thought that led you to using this instead of the one that gets packaged with qemu?

Quoted 8 lines

Good question.

I considered that the skiboot.lid shipped with QEMU was somewhat a default to make things work. The official released versions are the ones used by the outside world on real systems and were a better target for tests.

That said, using the default version might be enough. Maintainers, please advise !

IMHO:

- We want to test the things that *we* ship

Quoted 8 lines

- We want to download as few things as possible, since downloads often slow down the tests and break CI runs if the network to the download site is not available

==> I'd prefer to use the internal skiboot.lid unless there is
really a compelling reason to use the external one.

Just my 0.02 € though.

I agree 100%. If the internal skiboot isn't the "real" one, then we should update it to something that is.

Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
#7 lore raw
Quoted 41 lines · David Gibson
Quoted 40 lines · Thomas Huth
Quoted 39 lines · Cédric Le Goater
Quoted 20 lines · Joel Stanley
Quoted 19 lines · Cédric Le Goater

Fetch the OpenPOWER images to boot the powernv8 and powernv9 machines with a simple PCI layout.

Cc Cleber Rosa <[email protected]>
Cc Wainer dos Santos Moschetta <[email protected]>
---
  tests/acceptance/boot_linux_console.py | 42 ++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
tests/acceptance/boot_linux_console.py +0 -0
index 5248c8097df9..da93a475ca87 100644
@@ -1176,6 +1176,48 @@ def test_ppc64_e500(self):
          tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
          self.do_test_advcal_2018('19', tar_hash, 'uImage')
 
Quoted 11 lines

tests/acceptance/boot_linux_console.py def test_ppc64_e500(self): · line 1186

Quoted 8 lines
tests/acceptance/boot_linux_console.py +8 -0
+    def do_test_ppc64_powernv(self, proc):
+
+        images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
+
+        skiboot_url = images_url + 'skiboot.lid'
+        skiboot_hash = 'a9ffcddbf238f86cda4b2cae2882d6bd13cff8489109758a4980efaf154f4a29'
+        skiboot_path = self.fetch_asset(skiboot_url, asset_hash=skiboot_hash,
+                                       algorithm='sha256')

What's the thought that led you to using this instead of the one that gets packaged with qemu?

Good question.

I considered that the skiboot.lid shipped with QEMU was somewhat a default to make things work. The official released versions are the ones used by the outside world on real systems and were a better target for tests.

Quoted 6 lines
Quoted 6 lines
Quoted 2 lines

That said, using the default version might be enough. Maintainers, please advise !

IMHO:

- We want to test the things that *we* ship

I'd clarify here:

- We want to test "in the default pipeline" the things that *we* ship

Quoted 5 lines
Quoted 5 lines

- We want to download as few things as possible, since downloads often slow down the tests and break CI runs if the network to the download site is not available

Quoted 7 lines
Quoted 4 lines

==> I'd prefer to use the internal skiboot.lid unless there is
really a compelling reason to use the external one.

Just my 0.02 € though.

I agree 100%. If the internal skiboot isn't the "real" one, then we should update it to something that is.

Here I'm in favor in adding the external skiboot as a non-default test. So tests are shared in mainstream, and forks willing to run them can opt for it. The current simplest way to do that is using environment variables [*], and tag your tests with @skipUnless. I.e.:

def do_test_ppc64_powernv(self, proc, use_internal_skiboot_lid):

      ....

def test_ppc_powernv8(self):

      self.do_test_ppc64_powernv('P8', true)

@skipUnless(os.getenv('TEST_BLEEDING_EDGE_SKIBOOT'),
'Restricted to internal skiboot.lid')
def test_ppc_powernv8_bleeding_edge(self):

      self.do_test_ppc64_powernv('P8', false)

[*] https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-variables