diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-09-08 12:18:06 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2017-09-08 12:18:06 +0000 |
| commit | 00a070f81e93247f1cd517dd5cb4c64166241518 (patch) | |
| tree | 6ba4b42ac6f427e6e61f89d22f3395573364c331 /trusty-arm64-tcwg-base | |
| parent | 482dd5b0ae78f24899ae90c9db4cf42a43650fc4 (diff) | |
| parent | 802674fd7f853b0e27755d6e122bbfa4f9da7c4a (diff) | |
Merge "*-tcwg-base: Add ability to run QEMU VMs, including using KVM"
Diffstat (limited to 'trusty-arm64-tcwg-base')
| -rw-r--r-- | trusty-arm64-tcwg-base/Dockerfile | 2 | ||||
| -rw-r--r-- | trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile index 9db705f2..1977993f 100644 --- a/trusty-arm64-tcwg-base/Dockerfile +++ b/trusty-arm64-tcwg-base/Dockerfile @@ -36,6 +36,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ gawk \ gdb \ gdbserver \ + qemu-system-arm \ git \ groff \ libexpat1-dev \ @@ -51,6 +52,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \ make \ net-tools \ netcat \ + nfs-kernel-server \ ninja-build \ openjdk-7-jdk \ openssh-server \ diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile index e92dae23..8b713bb4 100644 --- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile +++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/Dockerfile @@ -1,7 +1,7 @@ FROM linaro/ci-arm64-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 |