Pau Espin Pedrol has submitted this change and it was merged.
Change subject: contrib/jenkins.sh: Use qemu+proot+debootstrap to run tests
with ARM instruction set
......................................................................
contrib/jenkins.sh: Use qemu+proot+debootstrap to run tests with ARM
instruction set
The following logic doesn't require root access to run the tests, which
means we can easily run it inside jenkins.
Change-Id: Iba3f4de008662805d8ffc46e1f473e407b088fb8
---
M contrib/jenkins.sh
M tests/testsuite.at
2 files changed, 55 insertions(+), 3 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index f31579e..11def5c 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,12 +1,62 @@
#!/bin/sh
set -ex
-osmo-clean-workspace.sh
+substr() { [ -z "${2##*$1*}" ]; }
+
+#apt-get install qemu qemu-user-static qemu-system-arm debootstrap fakeroot
proot
+mychroot_nocwd() {
+ # LC_ALL + LANGUAGE set to avoid lots of print errors due to locale
not being set inside container
+ # PATH is needed to be able to reach binaries like ldconfig without
logging in to root, which adds the paths to PATH.
+ # PROOT_NO_SECCOMP is requried due to proot bug #106
+ LC_ALL=C LANGUAGE=C PATH="$PATH:/usr/sbin:/sbin" PROOT_NO_SECCOMP=1
proot -r "$ROOTFS" -w / -b /proc --root-id -q qemu-arm-static "$@"
+}
+
+mychroot() {
+ mychroot_nocwd -w / "$@"
+}
+
+if [ -z "${INSIDE_CHROOT}" ]; then
+
+ osmo-clean-workspace.sh
+
+ # Only use ARM chroot if host is not ARM and the target is ARM:
+ if ! $(substr "arm" "$(uname -m)") && [ "x${INSTR}" = "x--with-neon"
-o "x${INSTR}" = "x--with-neon-vfpv4" ]; then
+
+ OSMOTRX_DIR="$PWD" # we assume we are called as
contrib/jenkins.sh
+ ROOTFS_PREFIX="${ROOTFS_PREFIX:-/opt}"
+ ROOTFS="${ROOTFS_PREFIX}/qemu-img"
+ mkdir -p "${ROOTFS_PREFIX}"
+
+ # Prepare chroot:
+ if [ ! -d "$ROOTFS" ]; then
+ mkdir -p "$ROOTFS"
+ if [ "x${USE_DEBOOTSTRAP}" = "x1" ]; then
+ fakeroot qemu-debootstrap --foreign
--include="linux-image-armmp-lpae" --arch=armhf stretch "$ROOTFS"
http://ftp.de.debian.org/debian/
+ # Hack to avoid debootstrap trying to mount
/proc, as it will fail with "no permissions" and anyway proot takes care of it:
+ sed -i "s/setup_proc//g"
"$ROOTFS/debootstrap/suite-script"
+ mychroot /debootstrap/debootstrap
--second-stage --verbose http://ftp.de.debian.org/debian/
+ else
+ wget -nc -q
"https://uk.images.linuxcontainers.org/images/debian/stretch/armhf/default/20180114_22:42/rootfs.tar.xz";
+ tar -xf rootfs.tar.xz -C "$ROOTFS/" || true
+ echo "nameserver 8.8.8.8" >
"$ROOTFS/etc/resolv.conf"
+ fi
+ mychroot -b /dev apt-get update
+ mychroot apt-get -y install build-essential
dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git
+ fi
+ # Run jenkins.sh inside the chroot:
+ INSIDE_CHROOT=1 mychroot_nocwd -w /osmo-trx -b
"$OSMOTRX_DIR:/osmo-trx" -b "$(which
osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" ./contrib/jenkins.sh
+ exit 0
+ fi
+fi
+
+### BUILD osmo-trx
autoreconf --install --force
-./configure
+./configure $INSTR
$MAKE $PARALLEL_MAKE
$MAKE check \
|| cat-testlogs.sh
-osmo-clean-workspace.sh
+if [ -z "x${INSIDE_CHROOT}" ]; then
+ osmo-clean-workspace.sh
+fi
diff --git a/tests/testsuite.at b/tests/testsuite.at
index c6ca848..ca979e5 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -46,6 +46,8 @@
AT_SETUP([convolve_test])
AT_KEYWORDS([convolve_test])
+# Disabled for ARM builds as it gives different output than x86, see OS#2826
+AT_SKIP_IF(! uname -m | grep x86)
cat $abs_srcdir/Transceiver52M/convolve_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/Transceiver52M/convolve_test], [], [expout],
[])
AT_CLEANUP
--
To view, visit https://gerrit.osmocom.org/5763
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3f4de008662805d8ffc46e1f473e407b088fb8
Gerrit-PatchSet: 13
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msur...@sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pes...@sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilira...@gmail.com>
