summaryrefslogtreecommitdiffstats
path: root/update_jdn.sh
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-21 17:22:10 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-21 17:31:16 +0200
commitb5c6a9ddff61f9ed783c6ac6e3feb952f85094f2 (patch)
tree61091eec3786722d190009e4211fd1e33dd2e6f6 /update_jdn.sh
parent03cfc1f8a12a8290ffffd1742b608cc566c41003 (diff)
downloadjenkins.debian.net-b5c6a9ddff61f9ed783c6ac6e3feb952f85094f2.tar.xz
lvc: put VM storage in /srv/workspace/vm-pools/
Diffstat (limited to 'update_jdn.sh')
-rwxr-xr-xupdate_jdn.sh18
1 files changed, 13 insertions, 5 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index 33aced15..e6e7aafa 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -88,16 +88,24 @@ for user in helmut holger mattia lunar phil ; do
sudo usermod -G $extra_groups $user
done
+sudo mkdir -p /srv/workspace
+[ -d /srv/schroots ] || sudo mkdir -p /srv/schroots
+[ -h /chroots ] || sudo ln -s /srv/workspace/chroots /chroots
+[ -h /schroots ] || sudo ln -s /srv/schroots /schroots
+
if [ "$HOSTNAME" = "jenkins-test-vm" ] || [ "$HOSTNAME" = "profitbricks-build10-amd64" ] ; then
# jenkins needs access to libvirt
sudo adduser jenkins libvirt
sudo adduser jenkins libvirt-qemu
-fi
-sudo mkdir -p /srv/workspace
-[ -d /srv/schroots ] || sudo mkdir -p /srv/schroots
-[ -h /chroots ] || sudo ln -s /srv/workspace/chroots /chroots
-[ -h /schroots ] || sudo ln -s /srv/schroots /schroots
+ # we need a directory for the VM's storage pools
+ VM_POOL_DIR=/srv/workspace/vm-pools
+ if [ ! -d $VM_POOL_DIR ] ; then
+ sudo mkdir $VM_POOL_DIR
+ sudo chown jenkins:libvirt-qemu $VM_POOL_DIR
+ sudo chmod 775 $VM_POOL_DIR
+ fi
+fi
# prepare tmpfs on some hosts
case $HOSTNAME in