Merge branch 'master' into deploy

Author: mpe

README.md

@@ -65,7 +65,6 @@ There are images for various toolchains, they are encoded in the distro name/ver
  - Fedora 35 `fedora@35`
  - Fedora 34 `fedora@34`
  - Fedora 33 `fedora@33`
- - Fedora 32 `fedora@32`
  - Fedora 31 `fedora@31`
 
 Only the Ubuntu toolchains can build the selftests.

build/Makefile

@@ -57,7 +57,7 @@ docs@${1}@${2}: image@${1}@${2}
 DOCS += docs@${1}@${2}
 endef
 
-FEDORA_DISTROS := fedora@35 fedora@34 fedora@33 fedora@32 fedora@31
+FEDORA_DISTROS := fedora@35 fedora@34 fedora@33 fedora@31
 UBUNTU_DISTROS := ubuntu@21.10 ubuntu@21.04 ubuntu@20.10 ubuntu@20.04 ubuntu@18.04 ubuntu@16.04
 KORG_DISTROS := korg@11.1.0 korg@10.3.0 korg@9.3.0 korg@8.1.0 korg@5.5.0
 ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}

scripts/boot/qemu-44x

@@ -50,9 +50,10 @@ def main():
     p.expect("PowerPC 44x Platform")
     p.expect_prompt()
 
-    qemu_net_setup(p)
-    ping_test(p, check=False)
-    wget_test(p)
+    if os.environ.get('QEMU_NET_TESTS', True) != '0':
+        qemu_net_setup(p)
+        ping_test(p, check=False)
+        wget_test(p)
 
     p.send('echo o > /proc/sysrq-trigger')
     p.expect('System Halted, OK to turn off power')

scripts/boot/qemu-g3beige

@@ -0,0 +1,77 @@
+#!/usr/bin/python3
+#
+# Kernel needs:
+#  CONFIG_SERIAL_PMACZILOG=y
+#  CONFIG_SERIAL_PMACZILOG_TTYS=y
+#  CONFIG_SERIAL_PMACZILOG_CONSOLE=y
+#  CONFIG_DEVTMPFS=y
+#  CONFIG_DEVTMPFS_MOUNT=y
+#  CONFIG_NE2K_PCI=y
+#
+# $ cd ~/src/linux
+# $ make
+# $ ~/src/ci-scripts/scripts/boot/qemu-g3beige
+#
+# Or:
+#
+# export VMLINUX_PATH=~/src/linux/vmlinux
+# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
+#
+# Optional:
+# export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc
+# export ROOT_DISK_PATH=~/some/directory
+# Expects ppc-rootfs.cpio.gz in ROOT_DISK_PATH
+
+import logging
+import os, sys
+sys.path.append(f'{os.path.dirname(sys.argv[0])}/../../lib')
+
+from qemu import qemu_command, qemu_net_setup
+from pexpect_utils import *
+from utils import *
+
+
+def main():
+    setup_logging()
+    setup_timeout(60)
+
+    expected_release = get_expected_release()
+    if expected_release is None:
+        return False
+
+    vmlinux = get_vmlinux()
+    if vmlinux is None:
+        return False
+
+    p = PexpectHelper()
+    cmd = qemu_command(qemu='qemu-system-ppc', machine='g3beige', vmlinux=vmlinux, cmdline='noreboot')
+    p.spawn(cmd, logfile=open('console.log', 'w'))
+
+    standard_boot(p)
+
+    p.send("echo -n 'booted-revision: '; uname -r")
+    p.expect(f'booted-revision: {expected_release}')
+    p.expect_prompt()
+
+    p.send('cat /proc/cpuinfo')
+    p.expect('AAPL,PowerMac G3 MacRISC')
+    p.expect_prompt()
+
+    if os.environ.get('QEMU_NET_TESTS', True) != '0':
+        qemu_net_setup(p)
+        ping_test(p)
+        wget_test(p)
+
+    p.send('halt')
+    p.wait_for_exit()
+
+    if filter_log_warnings(open('console.log'), open('warnings.txt', 'w')):
+        logging.error('Errors/warnings seen in console.log')
+        return False
+
+    logging.info('Test completed OK')
+
+    return True
+
+
+sys.exit(0 if main() else 1)

scripts/boot/qemu-g5

@@ -55,9 +55,10 @@ def main():
     p.expect("PowerMac3,1 MacRISC MacRISC2 Power Macintosh")
     p.expect_prompt()
 
-    qemu_net_setup(p)
-    ping_test(p)
-    wget_test(p)
+    if os.environ.get('QEMU_NET_TESTS', True) != '0':
+        qemu_net_setup(p)
+        ping_test(p)
+        wget_test(p)
 
     p.send("halt")
     p.expect("reboot: System halted")

scripts/boot/qemu-mac99

@@ -56,9 +56,10 @@ def main():
     p.expect('PowerMac3,1 MacRISC MacRISC2 Power Macintosh')
     p.expect_prompt()
 
-    qemu_net_setup(p)
-    ping_test(p)
-    wget_test(p)
+    if os.environ.get('QEMU_NET_TESTS', True) != '0':
+        qemu_net_setup(p)
+        ping_test(p)
+        wget_test(p)
 
     p.send('halt')
     p.wait_for_exit()

scripts/boot/qemu-ppc64e

@@ -65,9 +65,10 @@ def main():
     p.expect("QEMU ppce500")
     p.expect_prompt()
 
-    qemu_net_setup(p)
-    ping_test(p, check=False)
-    wget_test(p)
+    if os.environ.get('QEMU_NET_TESTS', True) != '0':
+        qemu_net_setup(p)
+        ping_test(p, check=False)
+        wget_test(p)
 
     p.send("echo o > /proc/sysrq-trigger")
     p.wait_for_exit()