Run s390x test in qemu system instead of qemu user

Author: malbarbo

ci/docker/s390x-unknown-linux-gnu/Dockerfile

@@ -1,12 +1,23 @@
 FROM ubuntu:17.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        gcc libc6-dev qemu-user ca-certificates \
-        gcc-s390x-linux-gnu libc6-dev-s390x-cross
+        curl ca-certificates \
+        gcc libc6-dev \
+        gcc-s390x-linux-gnu libc6-dev-s390x-cross \
+        debian-archive-keyring debootstrap cpio \
+        qemu-user-static qemu-system-s390x \
+        sshpass openssh-client
 
+COPY linux-image.sh /
+RUN bash linux-image.sh "" s390x stretch
+
+RUN cd / && curl -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img
+
+ARG USERID
+RUN adduser --uid $USERID --disabled-login --gecos cross cross
+
+COPY test-runner-s390x /
 ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
-    # TODO: in theory we should execute this, but qemu segfaults immediately :(
-    # CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /usr/s390x-linux-gnu" \
-    CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER=true \
+    CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="/test-runner-s390x" \
     CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
     PATH=$PATH:/rust/bin

ci/linux-image.sh

@@ -0,0 +1,76 @@
+set -ex
+
+params=$1
+arch=$2
+suite=$3
+mirror=$4
+dest=/qemu-root
+
+mkdir -p $dest
+cd $dest
+
+qemu-debootstrap \
+    --arch=$arch \
+    --variant=minbase \
+    --include="linux-image-$arch,systemd-sysv,openssh-server" \
+    $params \
+    $suite \
+    $dest \
+    $mirror || true
+
+# HACK: debootstrap calls mount, but mount cannot be executed inside a docker
+# container, so qemu-debootstrap fails. We replace mount with true and continue
+# the bootstrap process. We restore mount after the bootstrap.
+rm -f $dest/var/lib/dpkg/status
+mv $dest/bin/mount /mount.bak
+cp $dest/bin/true $dest/bin/mount
+chroot $dest /debootstrap/debootstrap --second-stage
+mv -f /mount.bak $dest/bin/mount
+
+# ssh
+chroot $dest adduser --disabled-password --gecos "" cross
+echo "cross:cross" | chroot $dest chpasswd
+
+# init
+cat <<EOF > $dest/init
+#!/bin/sh
+exec /sbin/init
+EOF
+chmod +x $dest/init
+
+# networking
+chroot $dest systemctl enable systemd-networkd
+
+cat <<EOF > $dest/etc/hostname
+qemu
+EOF
+
+cat <<EOF > $dest/etc/hosts
+127.0.0.1 localhost
+EOF
+
+cat <<EOF > $dest/etc/systemd/network/80-dhcp.network
+[Match]
+Name=*
+[Network]
+DHCP=v4
+EOF
+
+# copy vmlinuz and create initrd.img
+cp -f $dest/vmlinuz /qemu-vmlinuz
+
+rm -rf $dest/usr/lib/*-linux-*/gconv \
+       $dest/usr/lib/*-linux-*/perl-base \
+       $dest/usr/share/ \
+       $dest/boot \
+       $dest/var/cache \
+       $dest/var/lib/apt \
+       $dest/var/lib/dpkg \
+       $dest/var/log/*
+
+cd $dest
+find . -print0 | cpio --null -ov --format=newc | gzip > /qemu-initrd.img
+cd -
+
+# clean up
+rm -rf $dest

ci/run-docker.sh

@@ -6,7 +6,7 @@ set -ex
 run() {
     echo $1
     # use -f so we can use ci/ as build context
-    docker build -t libc -f ci/docker/$1/Dockerfile ci/
+    docker build --build-arg USERID=`id -u` -t libc -f ci/docker/$1/Dockerfile ci/
     mkdir -p target
     if [ -w /dev/kvm ]; then
       kvm="--volume /dev/kvm:/dev/kvm"

ci/test-runner-s390x

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+cd /
+
+(
+    flock -n 200 || exit 0
+    qemu-system-s390x -m 1024 -nographic \
+      -kernel /qemu-vmlinuz \
+      -initrd /qemu-initrd.img \
+      -netdev user,id=net0,hostfwd=tcp::10022-:22 \
+      -device virtio-net-ccw,netdev=net0 > /dev/null &
+    sleep 30
+) 200> /tmp/qemu.lock
+
+sshpass -p"cross" scp -q -o StrictHostKeyChecking=no -P 10022 $1 cross@localhost:/tmp
+sshpass -p"cross" ssh -q -o StrictHostKeyChecking=no -p 10022 cross@localhost /tmp/$(basename $1)