diff options
| -rw-r--r-- | cucumber/features/support/helpers/storage_helper.rb | 2 | ||||
| -rwxr-xr-x | 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 b8c79501..de782eed 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 8bb24f1d..f24f9b64 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 |