aboutsummaryrefslogtreecommitdiff
path: root/trusty-i386-tcwg-base
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-09-07 09:27:05 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-09-07 09:27:05 +0000
commit802674fd7f853b0e27755d6e122bbfa4f9da7c4a (patch)
tree930a1dc26b75c5b8988c76dc90706d387fa24536 /trusty-i386-tcwg-base
parent274074146ae4f3c7319f1818d602caee39f1b61c (diff)
*-tcwg-base: Add ability to run QEMU VMs, including using KVM
The harness implementing running QEMU VMs in docker containers is in toolchain/jenkins-scripts/start-container-qemu.sh. Rootfs of the container is shared via NFS with the VM. For NFS to work inside container NFS kernel module needs to be loaded, which is easiest achieved by installing nfs-kernel-server package on the host. For KVM to work container needs to be started in --privileged mode to provide /dev/kvm inside the container. Change-Id: I7cba73e350dfbee6e4dde0797eb4bed90fe0c664
Diffstat (limited to 'trusty-i386-tcwg-base')
-rw-r--r--trusty-i386-tcwg-base/Dockerfile2
-rw-r--r--trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile2
2 files changed, 3 insertions, 1 deletions
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile
index e0fbe517..7360403d 100644
--- a/trusty-i386-tcwg-base/Dockerfile
+++ b/trusty-i386-tcwg-base/Dockerfile
@@ -41,6 +41,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
gawk \
gdb \
gdbserver \
+ qemu-system-arm \
git \
groff \
libexpat1-dev \
@@ -59,6 +60,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
mingw32 \
net-tools \
netcat \
+ nfs-kernel-server \
ninja-build \
openjdk-7-jdk \
openssh-server \
diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
index 59506abc..fe05c785 100644
--- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
+++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/Dockerfile
@@ -1,7 +1,7 @@
FROM linaro/ci-i386-tcwg-base-ubuntu:trusty
RUN groupadd -g 9000 tcwg-infra \
- && useradd -m -g tcwg-infra -u 11827 tcwg-buildslave \
+ && useradd -m -g tcwg-infra -G kvm -u 11827 tcwg-buildslave \
&& echo 'tcwg-buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
&& chmod 0440 /etc/sudoers.d/jenkins \
&& mkdir -p /home/tcwg-buildslave/workspace