Skip to contentSkip to conversation

tests/acceptance: add a test for devices on s390x

RFC PATCH Superseded Cornelia Huck 3 participants 8 messages Nov 25, 2020 – Nov 26, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 tests/acceptance: add a test for devices on s390x

This adds a very basic test for checking that we present devices in a way that Linux can consume: boot with both virtio-net-ccw and virtio-net-pci attached and then verify that Linux is able to see and detect these devices.

---

A very basic test, but it would have caught the recent zPCI regression.

If anyone has a better idea than using early debug shells in the Debian install image, please let me know. At least it's quick, as we can check for the devices quite early in the boot sequence.

Not sure if running under both kvm and tcg on an s390 host would add useful extra coverage. Also not sure if this needs fencing on any of the public CIs (have not tried yet).

---
 tests/acceptance/s390_devices.py | 68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/acceptance/s390_devices.py
tests/acceptance/s390_devices.py new file +68 -0
new file mode 100644
index 000000000000..6ce47061f35d
@@ -0,0 +1,68 @@
+# Functional test that boots an s390x Linux guest with ccw and PCI devices
+# attached and checks whether the devices are recognized by Linux
+#
+# Copyright (c) 2020 Red Hat, Inc.
+#
+# Author:
+#  Cornelia Huck <[email protected]>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
+
+
+import os
+
+from avocado_qemu import Test
+from avocado_qemu import exec_command_and_wait_for_pattern
+from avocado_qemu import wait_for_console_pattern
+
+class CheckS390xDevices(Test):
+    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+
+    def wait_for_console_pattern(self, success_message, vm=None):
+        wait_for_console_pattern(self, success_message,
+                                 failure_message='Kernel panic - not syncing',
+                                 vm=vm)
+
+    timeout = 60
+
+    def test(self):
+
+        """
+        :avocado: tags=arch:s390x
+        :avocado: tags=machine:s390-ccw-virtio
+        """
+
+        # XXX: switch to https when debian fixes their certificate
+        kernel_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/kernel.debian')
+        kernel_hash = '5af1aa839754f4d8817fb5878b4d55dfc887f45d'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        initrd_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/initrd.debian')
+        initrd_hash = '99252b28306184b876f979585e2d4bfe96b27464'
+        initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+
+        self.vm.set_console()
+        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                              'console=sclp0 root=/dev/ram0 BOOT_DEBUG=3')
+        self.vm.add_args('-nographic',
+                         '-kernel', kernel_path,
+                         '-initrd', initrd_path,
+                         '-append', kernel_command_line,
+                         '-device', 'virtio-net-ccw,devno=fe.1.1111',
+                         '-device', 'virtio-net-pci')
+        self.vm.launch()
+
+        shell_ready = "sh: can't access tty; job control turned off"
+        self.wait_for_console_pattern(shell_ready)
+        # first debug shell is too early, we need to wait for device detection
+        exec_command_and_wait_for_pattern(self, 'exit', shell_ready)
+
+        ccw_bus_id="0.1.1111"
+        pci_bus_id="0000:00:00.0"
+        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/',
+                                          ccw_bus_id)
+        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/pci/devices/',
+                                          pci_bus_id)
Signature · 1 line
2.26.2
#1 lore raw
Quoted 4 lines · Cornelia Huck

This adds a very basic test for checking that we present devices in a way that Linux can consume: boot with both virtio-net-ccw and virtio-net-pci attached and then verify that Linux is able to see and detect these devices.

Thanks for tackling it!

Quoted 5 lines

---

A very basic test, but it would have caught the recent zPCI regression.

Quoted 7 lines

If anyone has a better idea than using early debug shells in the Debian install image, please let me know. At least it's quick, as we can check for the devices quite early in the boot sequence.

Not sure if running under both kvm and tcg on an s390 host would add useful extra coverage. Also not sure if this needs fencing on any of the public CIs (have not tried yet).

We're only running the acceptance tests in the gitlab-CI, no worries about the others.

tests/acceptance/s390_devices.py

Quoted 10 lines
---
 tests/acceptance/s390_devices.py | 68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/acceptance/s390_devices.py
tests/acceptance/s390_devices.py new file +0 -0
new file mode 100644
index 000000000000..6ce47061f35d

s390x_devices.py ?

Or maybe even machine_s390x.py instead, like the other machine*.py files?

Quoted 18 lines
tests/acceptance/s390_devices.py new file +17 -0
@@ -0,0 +1,68 @@
+# Functional test that boots an s390x Linux guest with ccw and PCI devices
+# attached and checks whether the devices are recognized by Linux
+#
+# Copyright (c) 2020 Red Hat, Inc.
+#
+# Author:
+#  Cornelia Huck <[email protected]>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
+
+
+import os
+
+from avocado_qemu import Test
+from avocado_qemu import exec_command_and_wait_for_pattern
+from avocado_qemu import wait_for_console_pattern

tests/acceptance/s390_devices.py line 27

Quoted 10 lines
tests/acceptance/s390_devices.py new file +10 -0
+
+class CheckS390xDevices(Test):
+    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+
+    def wait_for_console_pattern(self, success_message, vm=None):
+        wait_for_console_pattern(self, success_message,
+                                 failure_message='Kernel panic - not syncing',
+                                 vm=vm)
+
+    timeout = 60

Running on public CIs can be slow ... I'd maybe directly start with 90 or 120 here.

Quoted 17 lines
tests/acceptance/s390_devices.py new file +17 -0
+    def test(self):
+
+        """
+        :avocado: tags=arch:s390x
+        :avocado: tags=machine:s390-ccw-virtio
+        """
+
+        # XXX: switch to https when debian fixes their certificate
+        kernel_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/kernel.debian')
+        kernel_hash = '5af1aa839754f4d8817fb5878b4d55dfc887f45d'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        initrd_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/initrd.debian')
+        initrd_hash = '99252b28306184b876f979585e2d4bfe96b27464'
+        initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)

tests/acceptance/s390_devices.py line 55

Quoted 10 lines
tests/acceptance/s390_devices.py new file +10 -0
+
+        self.vm.set_console()
+        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                              'console=sclp0 root=/dev/ram0 BOOT_DEBUG=3')
+        self.vm.add_args('-nographic',
+                         '-kernel', kernel_path,
+                         '-initrd', initrd_path,
+                         '-append', kernel_command_line,
+                         '-device', 'virtio-net-ccw,devno=fe.1.1111',
+                         '-device', 'virtio-net-pci')

Maybe use '-device', 'virtio-net-pci,addr=6' or something similar to check a non-default PCI address, too?

Quoted 4 lines
tests/acceptance/s390_devices.py new file +3 -0
+        self.vm.launch()
+
+        shell_ready = "sh: can't access tty; job control turned off"

tests/acceptance/s390_devices.py line 68

Quoted 10 lines
tests/acceptance/s390_devices.py new file +10 -0
+        self.wait_for_console_pattern(shell_ready)
+        # first debug shell is too early, we need to wait for device detection
+        exec_command_and_wait_for_pattern(self, 'exit', shell_ready)
+
+        ccw_bus_id="0.1.1111"
+        pci_bus_id="0000:00:00.0"
+        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/',
+                                          ccw_bus_id)
+        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/pci/devices/',
+                                          pci_bus_id)

Additional ideas (likely for later patches): Set a custom mac address for the virtio-net devices and check whether they show up correctly in the guest... Use "ping" to send some packets around (with -netdev user)...

Thomas

#2 lore raw
Quoted 37 lines · On Wed, 25 Nov 2020 16:03:13 +0100 Thomas Huth <[email protected]> wrote:
Quoted 4 lines · Cornelia Huck

This adds a very basic test for checking that we present devices in a way that Linux can consume: boot with both virtio-net-ccw and virtio-net-pci attached and then verify that Linux is able to see and detect these devices.

Thanks for tackling it!

Quoted 5 lines

---

A very basic test, but it would have caught the recent zPCI regression.

Quoted 7 lines

If anyone has a better idea than using early debug shells in the Debian install image, please let me know. At least it's quick, as we can check for the devices quite early in the boot sequence.

Not sure if running under both kvm and tcg on an s390 host would add useful extra coverage. Also not sure if this needs fencing on any of the public CIs (have not tried yet).

We're only running the acceptance tests in the gitlab-CI, no worries about the others.

tests/acceptance/s390_devices.py

Quoted 10 lines
---
 tests/acceptance/s390_devices.py | 68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/acceptance/s390_devices.py
tests/acceptance/s390_devices.py new file +0 -0
new file mode 100644
index 000000000000..6ce47061f35d

s390x_devices.py ?

Quoted 1 line

Or maybe even machine_s390x.py instead, like the other machine*.py files?

Makes sense.

Quoted 24 lines
Quoted 24 lines
tests/acceptance/s390_devices.py new file +22 -0
@@ -0,0 +1,68 @@
+# Functional test that boots an s390x Linux guest with ccw and PCI devices
+# attached and checks whether the devices are recognized by Linux
+#
+# Copyright (c) 2020 Red Hat, Inc.
+#
+# Author:
+#  Cornelia Huck <[email protected]>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later.  See the COPYING file in the top-level directory.
+
+
+import os
+
+from avocado_qemu import Test
+from avocado_qemu import exec_command_and_wait_for_pattern
+from avocado_qemu import wait_for_console_pattern
+
+class CheckS390xDevices(Test):
+    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+
+    def wait_for_console_pattern(self, success_message, vm=None):
Quoted 8 lines

tests/acceptance/s390_devices.py line 27

Quoted 5 lines
tests/acceptance/s390_devices.py new file +5 -0
+        wait_for_console_pattern(self, success_message,
+                                 failure_message='Kernel panic - not syncing',
+                                 vm=vm)
+
+    timeout = 60  

Running on public CIs can be slow ... I'd maybe directly start with 90 or 120 here.

Ok; I found it hard to pick a sensible value here.

Quoted 23 lines
Quoted 23 lines
tests/acceptance/s390_devices.py new file +22 -0
+    def test(self):
+
+        """
+        :avocado: tags=arch:s390x
+        :avocado: tags=machine:s390-ccw-virtio
+        """
+
+        # XXX: switch to https when debian fixes their certificate
+        kernel_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/kernel.debian')
+        kernel_hash = '5af1aa839754f4d8817fb5878b4d55dfc887f45d'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        initrd_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/initrd.debian')
+        initrd_hash = '99252b28306184b876f979585e2d4bfe96b27464'
+        initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+
+        self.vm.set_console()
+        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                              'console=sclp0 root=/dev/ram0 BOOT_DEBUG=3')
+        self.vm.add_args('-nographic',
Quoted 8 lines

tests/acceptance/s390_devices.py line 55

Quoted 5 lines
tests/acceptance/s390_devices.py new file +5 -0
+                         '-kernel', kernel_path,
+                         '-initrd', initrd_path,
+                         '-append', kernel_command_line,
+                         '-device', 'virtio-net-ccw,devno=fe.1.1111',
+                         '-device', 'virtio-net-pci')  

Maybe use '-device', 'virtio-net-pci,addr=6' or something similar to check a non-default PCI address, too?

Not sure if addr= will do the trick, I may need to add a zpci device.

Quoted 11 lines
Quoted 11 lines
tests/acceptance/s390_devices.py new file +10 -0
+        self.vm.launch()
+
+        shell_ready = "sh: can't access tty; job control turned off"
+        self.wait_for_console_pattern(shell_ready)
+        # first debug shell is too early, we need to wait for device detection
+        exec_command_and_wait_for_pattern(self, 'exit', shell_ready)
+
+        ccw_bus_id="0.1.1111"
+        pci_bus_id="0000:00:00.0"
+        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/',
Quoted 8 lines

tests/acceptance/s390_devices.py line 68

Quoted 4 lines
tests/acceptance/s390_devices.py new file +3 -0
+                                          ccw_bus_id)
+        exec_command_and_wait_for_pattern(self, 'ls /sys/bus/pci/devices/',
+                                          pci_bus_id)

Additional ideas (likely for later patches): Set a custom mac address for the virtio-net devices and check whether they show up correctly in the guest... Use "ping" to send some packets around (with -netdev user)...

This needs a fully running userspace, though. I was planning on adding more device types first.

#3 lore raw
Quoted 36 lines · On Wed, 25 Nov 2020 16:30:34 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 24 lines · On Wed, 25 Nov 2020 16:03:13 +0100 Thomas Huth <[email protected]> wrote:
Quoted 22 lines · Cornelia Huck
tests/acceptance/s390_devices.py new file +22 -0
+    def test(self):
+
+        """
+        :avocado: tags=arch:s390x
+        :avocado: tags=machine:s390-ccw-virtio
+        """
+
+        # XXX: switch to https when debian fixes their certificate
+        kernel_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/kernel.debian')
+        kernel_hash = '5af1aa839754f4d8817fb5878b4d55dfc887f45d'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        initrd_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/initrd.debian')
+        initrd_hash = '99252b28306184b876f979585e2d4bfe96b27464'
+        initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+
+        self.vm.set_console()
+        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                              'console=sclp0 root=/dev/ram0 BOOT_DEBUG=3')
+        self.vm.add_args('-nographic',
Quoted 8 lines

tests/acceptance/s390_devices.py line 55

Quoted 5 lines
tests/acceptance/s390_devices.py new file +5 -0
+                         '-kernel', kernel_path,
+                         '-initrd', initrd_path,
+                         '-append', kernel_command_line,
+                         '-device', 'virtio-net-ccw,devno=fe.1.1111',
+                         '-device', 'virtio-net-pci')    

Maybe use '-device', 'virtio-net-pci,addr=6' or something similar to check a non-default PCI address, too?

Quoted 1 line

Not sure if addr= will do the trick, I may need to add a zpci device.

It seems I need both a zpci device (to specify the uid) and a newer kernel (so that the uid is actually used to construct the address in the guest). I guess I should use snapshots.debian.org to get a stable link to a newer version?

#4 lore raw
Quoted 39 lines · Cornelia Huck
Quoted 36 lines · On Wed, 25 Nov 2020 16:30:34 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 32 lines · On Wed, 25 Nov 2020 16:03:13 +0100 Thomas Huth <[email protected]> wrote:
Quoted 17 lines · Cornelia Huck
tests/acceptance/s390_devices.py new file +17 -0
+    def test(self):
+
+        """
+        :avocado: tags=arch:s390x
+        :avocado: tags=machine:s390-ccw-virtio
+        """
+
+        # XXX: switch to https when debian fixes their certificate
+        kernel_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/kernel.debian')
+        kernel_hash = '5af1aa839754f4d8817fb5878b4d55dfc887f45d'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        initrd_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/initrd.debian')
+        initrd_hash = '99252b28306184b876f979585e2d4bfe96b27464'
+        initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)

tests/acceptance/s390_devices.py line 55

Quoted 10 lines
tests/acceptance/s390_devices.py new file +10 -0
+
+        self.vm.set_console()
+        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                              'console=sclp0 root=/dev/ram0 BOOT_DEBUG=3')
+        self.vm.add_args('-nographic',
+                         '-kernel', kernel_path,
+                         '-initrd', initrd_path,
+                         '-append', kernel_command_line,
+                         '-device', 'virtio-net-ccw,devno=fe.1.1111',
+                         '-device', 'virtio-net-pci')    

Maybe use '-device', 'virtio-net-pci,addr=6' or something similar to check a non-default PCI address, too?

Quoted 6 lines
Quoted 1 line

Not sure if addr= will do the trick, I may need to add a zpci device.

It seems I need both a zpci device (to specify the uid) and a newer kernel (so that the uid is actually used to construct the address in the guest). I guess I should use snapshots.debian.org to get a stable link to a newer version?

Not sure ... I assume the links to archive.debian.org are less likely to change? So maybe simply forget about testing a different PCI address for now, the default should be good enough for a simple check.

Thomas

PS: Seems like at least "ip addr" is working there already - so you could at least check the MAC address setting?

#5 lore raw
Quoted 42 lines · On Thu, 26 Nov 2020 13:18:38 +0100 Thomas Huth <[email protected]> wrote:
Quoted 41 lines · Cornelia Huck
Quoted 37 lines · On Wed, 25 Nov 2020 16:30:34 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 24 lines · On Wed, 25 Nov 2020 16:03:13 +0100 Thomas Huth <[email protected]> wrote:
Quoted 22 lines · Cornelia Huck
tests/acceptance/s390_devices.py new file +22 -0
+    def test(self):
+
+        """
+        :avocado: tags=arch:s390x
+        :avocado: tags=machine:s390-ccw-virtio
+        """
+
+        # XXX: switch to https when debian fixes their certificate
+        kernel_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/kernel.debian')
+        kernel_hash = '5af1aa839754f4d8817fb5878b4d55dfc887f45d'
+        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+        initrd_url = ('http://archive.debian.org/debian/dists/jessie/main'
+                      '/installer-s390x/current/images/generic/initrd.debian')
+        initrd_hash = '99252b28306184b876f979585e2d4bfe96b27464'
+        initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+
+        self.vm.set_console()
+        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+                              'console=sclp0 root=/dev/ram0 BOOT_DEBUG=3')
+        self.vm.add_args('-nographic',
Quoted 8 lines

tests/acceptance/s390_devices.py line 55

Quoted 5 lines
tests/acceptance/s390_devices.py new file +5 -0
+                         '-kernel', kernel_path,
+                         '-initrd', initrd_path,
+                         '-append', kernel_command_line,
+                         '-device', 'virtio-net-ccw,devno=fe.1.1111',
+                         '-device', 'virtio-net-pci')      

Maybe use '-device', 'virtio-net-pci,addr=6' or something similar to check a non-default PCI address, too?

Not sure if addr= will do the trick, I may need to add a zpci device.

Quoted 8 lines
Quoted 4 lines

It seems I need both a zpci device (to specify the uid) and a newer kernel (so that the uid is actually used to construct the address in the guest). I guess I should use snapshots.debian.org to get a stable link to a newer version?

Not sure ... I assume the links to archive.debian.org are less likely to change? So maybe simply forget about testing a different PCI address for now, the default should be good enough for a simple check.

I'd expect the snapshot.debian.org links to be stable as well (we already use them in some places). The problem is that what is currently available at archive.debian.org is really quite ancient (3.16 based is the newest...). If we want to test something that at least resembles real life usage, we should use at least use a 4.x kernel. The kernels that do something with the uid will also end up using different default pci addresses if no uid is provided, so the 0000:00:00.0 seems quite unrealistic to come up nowadays.

Quoted 5 lines

Thomas

PS: Seems like at least "ip addr" is working there already - so you could at least check the MAC address setting?

I'd prefer to do this in an add-on patch :)

#6 lore raw
In reply to Thomas Huth

Hi Cornelia,

Quoted 12 lines · Thomas Huth
Quoted 4 lines · Cornelia Huck

This adds a very basic test for checking that we present devices in a way that Linux can consume: boot with both virtio-net-ccw and virtio-net-pci attached and then verify that Linux is able to see and detect these devices.

Thanks for tackling it!

Quoted 4 lines

---

A very basic test, but it would have caught the recent zPCI regression.

Thanks for adding this test :)

Quoted 4 lines
Quoted 4 lines

If anyone has a better idea than using early debug shells in the Debian install image, please let me know. At least it's quick, as we can check for the devices quite early in the boot sequence.

This is the simplest cheaper way I think.

Alternative is to use Guenter's images:
https://github.com/groeck/linux-build-test/tree/master/rootfs/s390

Quoted 21 lines
Quoted 4 lines

Not sure if running under both kvm and tcg on an s390 host would add useful extra coverage. Also not sure if this needs fencing on any of the public CIs (have not tried yet).

We're only running the acceptance tests in the gitlab-CI, no worries about the others.

tests/acceptance/s390_devices.py

Quoted 10 lines
---
 tests/acceptance/s390_devices.py | 68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/acceptance/s390_devices.py
tests/acceptance/s390_devices.py new file +0 -0
new file mode 100644
index 000000000000..6ce47061f35d

s390x_devices.py ?

Quoted 1 line

Or maybe even machine_s390x.py instead, like the other machine*.py files?

Feel free to use whatever name/directory structure that help others to find your tests (don't forget to add an entry to MAINTAINERS).

Regards,

Phil.

#7 lore raw
Quoted 19 lines · On Wed, 25 Nov 2020 17:04:05 +0100 Philippe Mathieu-Daudé <[email protected]>…

Hi Cornelia,

Quoted 12 lines · Thomas Huth
Quoted 4 lines · Cornelia Huck

This adds a very basic test for checking that we present devices in a way that Linux can consume: boot with both virtio-net-ccw and virtio-net-pci attached and then verify that Linux is able to see and detect these devices.

Thanks for tackling it!

Quoted 4 lines

---

A very basic test, but it would have caught the recent zPCI regression.

Thanks for adding this test :)

Quoted 1 line
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines

If anyone has a better idea than using early debug shells in the Debian install image, please let me know. At least it's quick, as we can check for the devices quite early in the boot sequence.

This is the simplest cheaper way I think.

Alternative is to use Guenter's images:
https://github.com/groeck/linux-build-test/tree/master/rootfs/s390

I tried to use these, but it seems I would need a kernel with the relevant drivers built-in for that, and neither Fedora nor Debian seem to do that. Maybe I'm holding it wrong, but I think I'll just stick to my current approach, as I have that one working :)

Quoted 22 lines
Quoted 22 lines
Quoted 5 lines

Not sure if running under both kvm and tcg on an s390 host would add useful extra coverage. Also not sure if this needs fencing on any of the public CIs (have not tried yet).

We're only running the acceptance tests in the gitlab-CI, no worries about the others.

tests/acceptance/s390_devices.py

Quoted 10 lines
---
 tests/acceptance/s390_devices.py | 68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/acceptance/s390_devices.py
tests/acceptance/s390_devices.py new file +0 -0
new file mode 100644
index 000000000000..6ce47061f35d

s390x_devices.py ?

Quoted 4 lines
Quoted 1 line

Or maybe even machine_s390x.py instead, like the other machine*.py files?

Feel free to use whatever name/directory structure that help others to find your tests (don't forget to add an entry to MAINTAINERS).

Good point, I forgot about an explicit MAINTAINERS entry.

Quoted 5 lines

Regards,

Phil.