From dea6f5a6df1c078a08cac5076758c43ec86b83b5 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 29 Sep 2016 21:12:48 +0000 Subject: trusty-*-test[-test]: Use scratch volume for $HOME/workspace ... instead of using a bind-mount, which causes problems with parallel build runs. Change-Id: Id9799927f149faeac7ee19e1ac281af8b022b81d --- trusty-armhf-tcwg/Dockerfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'trusty-armhf-tcwg') diff --git a/trusty-armhf-tcwg/Dockerfile b/trusty-armhf-tcwg/Dockerfile index 2428634..8361fd8 100644 --- a/trusty-armhf-tcwg/Dockerfile +++ b/trusty-armhf-tcwg/Dockerfile @@ -71,15 +71,22 @@ RUN chmod 0700 /etc/skel/.ssh \ && chmod 440 /etc/sudoers.d/jenkins \ && install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \ && sed -i -e 's:^session *required *pam_loginuid.so:# session required pam_loginuid.so:' /etc/pam.d/sshd \ - && mkdir -p /var/run/sshd + && mkdir -p /var/run/sshd \ + && mkdir -p /home/tcwg-buildslave/workspace \ + && chown tcwg-buildslave:tcwg-infra /home/tcwg-buildslave/workspace # Unfortunately, VOLUME doesn't support bind-mounts for portability reasons. # Therefore, the bind-mounts for the following paths are configured in # the ci.linaro.org's docker plugin. # Sources caches (read-only): # /home/tcwg-buildslave/snapshots-ref:/home/tcwg-buildslave/snapshots-ref:ro -# Workspace (read-write): -# /home/tcwg-buildslave/workspace:/home/tcwg-buildslave/workspace:rw +# Jenkins .jar cache (read-write): +# /home/tcwg-buildslave/.jenkins:/home/tcwg-buildslave/.jenkins:rw + +# We write most of the data inside workspace, so make it a scratch mount. +# Note that bind-mounting workspace from host will make jobs with parallel +# builds fail. +VOLUME /home/tcwg-buildslave/workspace # We use ssh multiplexing, which creates sockets in /tmp. Overlayfs, # which docker is using can't host sockets, so we use a scratch mount -- cgit v1.2.3