tests/functional: Convert the Avocado ppc64 tuxrun tests

Move the tests to a new file so that they can be run via
qemu-system-ppc64 in the functional framework.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241011131937.377223-3-thuth@redhat.com>
This commit is contained in:
Thomas Huth 2024-10-11 15:19:19 +02:00
parent c1b24f0fb7
commit d9dff75b08
3 changed files with 111 additions and 92 deletions

View File

@ -1484,6 +1484,7 @@ F: tests/qtest/rtas*
F: tests/qtest/libqos/rtas*
F: tests/functional/test_ppc64_pseries.py
F: tests/functional/test_ppc64_hv.py
F: tests/functional/test_ppc64_tuxrun.py
PowerNV (Non-Virtualized)
M: Cédric Le Goater <clg@kaod.org>

View File

@ -182,63 +182,6 @@ class TuxRunBaselineTest(QemuSystemTest):
self.vm.launch()
self.run_tuxtest_tests(haltmsg)
def ppc64_common_tuxrun(self, sums, prefix):
# add device args to command line.
self.require_netdev('user')
self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
'-device', 'virtio-net,netdev=vnet')
self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
'-device', '{"driver":"virtio-net-pci","netdev":'
'"hostnet0","id":"net0","mac":"52:54:00:4c:e3:86",'
'"bus":"pci.0","addr":"0x9"}')
self.vm.add_args('-device', '{"driver":"qemu-xhci","p2":15,"p3":15,'
'"id":"usb","bus":"pci.0","addr":"0x2"}')
self.vm.add_args('-device', '{"driver":"virtio-scsi-pci","id":"scsi0"'
',"bus":"pci.0","addr":"0x3"}')
self.vm.add_args('-device', '{"driver":"virtio-serial-pci","id":'
'"virtio-serial0","bus":"pci.0","addr":"0x4"}')
self.vm.add_args('-device', '{"driver":"scsi-cd","bus":"scsi0.0"'
',"channel":0,"scsi-id":0,"lun":0,"device_id":'
'"drive-scsi0-0-0-0","id":"scsi0-0-0-0"}')
self.vm.add_args('-device', '{"driver":"virtio-balloon-pci",'
'"id":"balloon0","bus":"pci.0","addr":"0x6"}')
self.vm.add_args('-audiodev', '{"id":"audio1","driver":"none"}')
self.vm.add_args('-device', '{"driver":"usb-tablet","id":"input0"'
',"bus":"usb.0","port":"1"}')
self.vm.add_args('-device', '{"driver":"usb-kbd","id":"input1"'
',"bus":"usb.0","port":"2"}')
self.vm.add_args('-device', '{"driver":"VGA","id":"video0",'
'"vgamem_mb":16,"bus":"pci.0","addr":"0x7"}')
self.vm.add_args('-object', '{"qom-type":"rng-random","id":"objrng0"'
',"filename":"/dev/urandom"}',
'-device', '{"driver":"virtio-rng-pci","rng":"objrng0"'
',"id":"rng0","bus":"pci.0","addr":"0x8"}')
self.vm.add_args('-object', '{"qom-type":"cryptodev-backend-builtin",'
'"id":"objcrypto0","queues":1}',
'-device', '{"driver":"virtio-crypto-pci",'
'"cryptodev":"objcrypto0","id":"crypto0","bus"'
':"pci.0","addr":"0xa"}')
self.vm.add_args('-device', '{"driver":"spapr-pci-host-bridge"'
',"index":1,"id":"pci.1"}')
self.vm.add_args('-device', '{"driver":"spapr-vscsi","id":"scsi1"'
',"reg":12288}')
self.vm.add_args('-m', '2G,slots=32,maxmem=4G',
'-object', 'memory-backend-ram,id=ram1,size=1G',
'-device', 'pc-dimm,id=dimm1,memdev=ram1')
# Create a temporary qcow2 and launch the test-case
with tempfile.NamedTemporaryFile(prefix=prefix,
suffix='.qcow2') as qcow2:
process.run(self.qemu_img + ' create -f qcow2 ' +
qcow2.name + ' 1G')
self.vm.add_args('-drive', 'file=' + qcow2.name +
',format=qcow2,if=none,id='
'drive-virtio-disk1',
'-device', 'virtio-blk-pci,bus=pci.0,'
'addr=0xb,drive=drive-virtio-disk1,id=virtio-disk1'
',bootindex=2')
self.common_tuxrun(csums=sums, drive="scsi-hd")
#
# The tests themselves. The configuration is derived from how
@ -436,41 +379,6 @@ class TuxRunBaselineTest(QemuSystemTest):
self.common_tuxrun(csums=sums, drive="virtio-blk-pci")
def test_ppc64(self):
"""
:avocado: tags=arch:ppc64
:avocado: tags=machine:pseries
:avocado: tags=cpu:POWER10
:avocado: tags=endian:big
:avocado: tags=console:hvc0
:avocado: tags=tuxboot:ppc64
:avocado: tags=image:vmlinux
:avocado: tags=extradev:driver=spapr-vscsi
:avocado: tags=root:sda
"""
sums = { "rootfs.ext4.zst" :
"1d953e81a4379e537fc8e41e05a0a59d9b453eef97aa03d47866c6c45b00bdff",
"vmlinux" :
"f22a9b9e924174a4c199f4c7e5d91a2339fcfe51c6eafd0907dc3e09b64ab728" }
self.ppc64_common_tuxrun(sums, prefix='tuxrun_ppc64_')
def test_ppc64le(self):
"""
:avocado: tags=arch:ppc64
:avocado: tags=machine:pseries
:avocado: tags=cpu:POWER10
:avocado: tags=console:hvc0
:avocado: tags=tuxboot:ppc64le
:avocado: tags=image:vmlinux
:avocado: tags=extradev:driver=spapr-vscsi
:avocado: tags=root:sda
"""
sums = { "rootfs.ext4.zst" :
"b442678c93fb8abe1f7d3bfa20556488de6b475c22c8fed363f42cf81a0a3906",
"vmlinux" :
"979eb61b445a010fb13e2b927126991f8ceef9c590fa2be0996c00e293e80cf2" }
self.ppc64_common_tuxrun(sums, prefix='tuxrun_ppc64le_')
def test_riscv32(self):
"""
:avocado: tags=arch:riscv32

View File

@ -0,0 +1,110 @@
#!/usr/bin/env python3
#
# Functional test that boots known good tuxboot images the same way
# that tuxrun (www.tuxrun.org) does. This tool is used by things like
# the LKFT project to run regression tests on kernels.
#
# Copyright (c) 2023 Linaro Ltd.
#
# Author:
# Alex Bennée <alex.bennee@linaro.org>
#
# SPDX-License-Identifier: GPL-2.0-or-later
import tempfile
from qemu_test import run_cmd, Asset
from qemu_test.tuxruntest import TuxRunBaselineTest
class TuxRunPPC64Test(TuxRunBaselineTest):
def ppc64_common_tuxrun(self, kernel_asset, rootfs_asset, prefix):
self.set_machine('pseries')
self.cpu='POWER10'
self.console='hvc0'
self.root='sda'
self.extradev='spapr-vscsi'
# add device args to command line.
self.require_netdev('user')
self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
'-device', 'virtio-net,netdev=vnet')
self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
'-device', '{"driver":"virtio-net-pci","netdev":'
'"hostnet0","id":"net0","mac":"52:54:00:4c:e3:86",'
'"bus":"pci.0","addr":"0x9"}')
self.vm.add_args('-device', '{"driver":"qemu-xhci","p2":15,"p3":15,'
'"id":"usb","bus":"pci.0","addr":"0x2"}')
self.vm.add_args('-device', '{"driver":"virtio-scsi-pci","id":"scsi0"'
',"bus":"pci.0","addr":"0x3"}')
self.vm.add_args('-device', '{"driver":"virtio-serial-pci","id":'
'"virtio-serial0","bus":"pci.0","addr":"0x4"}')
self.vm.add_args('-device', '{"driver":"scsi-cd","bus":"scsi0.0"'
',"channel":0,"scsi-id":0,"lun":0,"device_id":'
'"drive-scsi0-0-0-0","id":"scsi0-0-0-0"}')
self.vm.add_args('-device', '{"driver":"virtio-balloon-pci",'
'"id":"balloon0","bus":"pci.0","addr":"0x6"}')
self.vm.add_args('-audiodev', '{"id":"audio1","driver":"none"}')
self.vm.add_args('-device', '{"driver":"usb-tablet","id":"input0"'
',"bus":"usb.0","port":"1"}')
self.vm.add_args('-device', '{"driver":"usb-kbd","id":"input1"'
',"bus":"usb.0","port":"2"}')
self.vm.add_args('-device', '{"driver":"VGA","id":"video0",'
'"vgamem_mb":16,"bus":"pci.0","addr":"0x7"}')
self.vm.add_args('-object', '{"qom-type":"rng-random","id":"objrng0"'
',"filename":"/dev/urandom"}',
'-device', '{"driver":"virtio-rng-pci","rng":"objrng0"'
',"id":"rng0","bus":"pci.0","addr":"0x8"}')
self.vm.add_args('-object', '{"qom-type":"cryptodev-backend-builtin",'
'"id":"objcrypto0","queues":1}',
'-device', '{"driver":"virtio-crypto-pci",'
'"cryptodev":"objcrypto0","id":"crypto0","bus"'
':"pci.0","addr":"0xa"}')
self.vm.add_args('-device', '{"driver":"spapr-pci-host-bridge"'
',"index":1,"id":"pci.1"}')
self.vm.add_args('-device', '{"driver":"spapr-vscsi","id":"scsi1"'
',"reg":12288}')
self.vm.add_args('-m', '2G,slots=32,maxmem=4G',
'-object', 'memory-backend-ram,id=ram1,size=1G',
'-device', 'pc-dimm,id=dimm1,memdev=ram1')
# Create a temporary qcow2 and launch the test-case
with tempfile.NamedTemporaryFile(prefix=prefix,
suffix='.qcow2') as qcow2:
run_cmd([self.qemu_img, 'create', '-f', 'qcow2', qcow2.name, ' 1G'])
self.vm.add_args('-drive', 'file=' + qcow2.name +
',format=qcow2,if=none,id='
'drive-virtio-disk1',
'-device', 'virtio-blk-pci,bus=pci.0,'
'addr=0xb,drive=drive-virtio-disk1,id=virtio-disk1'
',bootindex=2')
self.common_tuxrun(kernel_asset, rootfs_asset=rootfs_asset,
drive="scsi-hd")
ASSET_PPC64_KERNEL = Asset(
'https://storage.tuxboot.com/20230331/ppc64/vmlinux',
'1d953e81a4379e537fc8e41e05a0a59d9b453eef97aa03d47866c6c45b00bdff')
ASSET_PPC64_ROOTFS = Asset(
'https://storage.tuxboot.com/20230331/ppc64/rootfs.ext4.zst',
'f22a9b9e924174a4c199f4c7e5d91a2339fcfe51c6eafd0907dc3e09b64ab728')
def test_ppc64(self):
self.ppc64_common_tuxrun(kernel_asset=self.ASSET_PPC64_KERNEL,
rootfs_asset=self.ASSET_PPC64_ROOTFS,
prefix='tuxrun_ppc64_')
ASSET_PPC64LE_KERNEL = Asset(
'https://storage.tuxboot.com/20230331/ppc64le/vmlinux',
'979eb61b445a010fb13e2b927126991f8ceef9c590fa2be0996c00e293e80cf2')
ASSET_PPC64LE_ROOTFS = Asset(
'https://storage.tuxboot.com/20230331/ppc64le/rootfs.ext4.zst',
'b442678c93fb8abe1f7d3bfa20556488de6b475c22c8fed363f42cf81a0a3906')
def test_ppc64le(self):
self.ppc64_common_tuxrun(kernel_asset=self.ASSET_PPC64LE_KERNEL,
rootfs_asset=self.ASSET_PPC64LE_ROOTFS,
prefix='tuxrun_ppc64le_')
if __name__ == '__main__':
TuxRunBaselineTest.main()