[Qa-jenkins-scm] [jenkins.debian.net] 01/01: lvc: move vm-pools to /srv/lvc to avoid filling swap via tmpfs

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 332af47cc2c59c7513d76cc89cef75046602737a
Author: Philip Hands <phil at hands.com>
Date:   Fri Jul 22 22:52:46 2016 +0200

    lvc: move vm-pools to /srv/lvc to avoid filling swap via tmpfs
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cucumber/features/support/helpers/storage_helper.rb |  2 +-
 update_jdn.sh                                       | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cucumber/features/support/helpers/storage_helper.rb b/cucumber/features/support/helpers/storage_helper.rb
index b8c7950..de782ee 100644
--- a/cucumber/features/support/helpers/storage_helper.rb
+++ b/cucumber/features/support/helpers/storage_helper.rb
@@ -19,7 +19,7 @@ class VMStorage
     pool_xml = REXML::Document.new(File.read("#{@xml_path}/storage_pool.xml"))
     pool_name = LIBVIRT_DOMAIN_NAME
     pool_xml.elements['pool/name'].text = pool_name
-    @pool_path = "/srv/workspace/vm-pools/#{pool_name}"  # FIXME -- hardwiring the .../vm-pools path semms like a poor effort
+    @pool_path = "/srv/lvc/vm-pools/#{pool_name}"  # FIXME -- hardwiring the .../vm-pools path semms like a poor effort
     begin
       @pool = @virt.lookup_storage_pool_by_name(pool_name)
     rescue Libvirt::RetrieveError
diff --git a/update_jdn.sh b/update_jdn.sh
index 8bb24f1..f24f9b6 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -123,12 +123,18 @@ if [ "$HOSTNAME" = "jenkins-test-vm" ] || [ "$HOSTNAME" = "profitbricks-build10-
 	sudo adduser jenkins libvirt-qemu
 
 	# we need a directory for the VM's storage pools
-	VM_POOL_DIR=/srv/workspace/vm-pools
+	VM_POOL_DIR=/srv/lvc/vm-pools
 	if [ ! -d $VM_POOL_DIR ] ; then
-		sudo mkdir $VM_POOL_DIR
+		sudo mkdir -p $VM_POOL_DIR
 		sudo chown jenkins:libvirt-qemu $VM_POOL_DIR
 		sudo chmod 775 $VM_POOL_DIR
 	fi
+
+	# tidy up after ourselves, for a while at least
+	OLD_VM_POOL_DIR=/srv/workspace/vm-pools
+	if [ -d "$OLD_VM_POOL_DIR" ] ; then
+		sudo rm -r "$OLD_VM_POOL_DIR"
+	fi
 fi
 
 # prepare tmpfs on some hosts

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git