Re: [PATCH] tests/acceptance: Add a test with the Fedora 31 kernel and initrd

[Cornelia Huck]

On Wed, 16 Dec 2020 12:36:13 +0100
Thomas Huth <thuth@redhat.com> wrote:

> On 16/12/2020 12.32, Cornelia Huck wrote:
> > On Wed, 16 Dec 2020 11:57:11 +0100
> > Thomas Huth <thuth@redhat.com> wrote:
> >   
> >> This initrd contains a virtio-net and a virtio-gpu kernel module,
> >> so we can check that we can set a MAC address for the network device
> >> and that we can successfully write some stuff into the emulated
> >> framebuffer of the virtio-gpu device.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >>  Based-on: 20201215183623.110128-1-thuth@redhat.com
> >>
> >>  tests/acceptance/machine_s390_ccw_virtio.py | 78 +++++++++++++++++++++
> >>  1 file changed, 78 insertions(+)
> >>
> >> diff --git a/tests/acceptance/machine_s390_ccw_virtio.py 
> >> b/tests/acceptance/machine_s390_ccw_virtio.py
> >> index abe25a08f0..a5be26b38e 100644
> >> --- a/tests/acceptance/machine_s390_ccw_virtio.py
> >> +++ b/tests/acceptance/machine_s390_ccw_virtio.py
> >> @@ -9,6 +9,8 @@
> >>  # 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 re
> >> +import tempfile
> >>  
> >>  from avocado_qemu import Test
> >>  from avocado_qemu import exec_command_and_wait_for_pattern
> >> @@ -150,3 +152,79 @@ class S390CCWVirtioMachine(Test):
> >>          self.vm.command('human-monitor-command', command_line='balloon 
> >> 128')
> >>          exec_command_and_wait_for_pattern(self, 'head -n 1 /proc/meminfo',
> >>                                            'MemTotal:         115640 kB')
> >> +
> >> +
> >> +    def test_s390x_fedora(self):
> >> +
> >> +        """
> >> +        :avocado: tags=arch:s390x
> >> +        :avocado: tags=machine:s390-ccw-virtio
> >> +        """
> >> +
> >> +        kernel_url = ('https://archives.fedoraproject.org/pub/archive'
> >> +                      '/fedora-secondary/releases/31/Server/s390x/os'
> >> +                      '/images/kernel.img')
> >> +        kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb'
> >> +        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
> >> +
> >> +        initrd_url = ('https://archives.fedoraproject.org/pub/archive'
> >> +                      '/fedora-secondary/releases/31/Server/s390x/os'
> >> +                      '/images/initrd.img')
> >> +        initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f'
> >> +        initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
> >> +
> >> +        self.vm.set_console()
> >> +        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
> >> +                              ' audit=0 rd.rescue')
> >> +        self.vm.add_args('-nographic',
> >> +                         '-smp', '4',
> >> +                         '-m', '512',
> >> +                         '-name', 'Some Guest Name',
> >> +                         '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa',
> >> +                         '-kernel', kernel_path,
> >> +                         '-initrd', initrd_path,
> >> +                         '-append', kernel_command_line,
> >> +                         '-device', 
> >> 'virtio-net-pci,mac=02:ca:fe:fa:ce:12',
> >> +                         '-device', 'virtio-rng-ccw',
> >> +                         '-device', 'virtio-gpu-ccw')  
> > 
> > Would it make sense to explicitly specify bus ids for the ccw devices?
> > You could check for them below, and it would potentially be more clear
> > *what* actually failed (e.g. handling the mac address vs device
> > detection).  
> 
> Do you mean PCI or CCW bus ids? The MAC address is only used for a PCI
> device here... but sure, I can add some addresses if you like.

The PCI device would need a zpci device with an uid instead of the bus
id.