From: Tim Rozet <trozet@redhat.com>
Date: Thu, 9 Feb 2017 03:02:58 +0000 (-0500)
Subject: Apex: More fixes to csit snapshot create
X-Git-Tag: danube.1.0~323
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ed5bdce2b979c9defc47a0fbbde5494c47421122;p=releng.git

Apex: More fixes to csit snapshot create

Change-Id: I210e5148c8058488edab6f26ece42b011e0e618d
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/apex/apex-snapshot-create.sh b/jjb/apex/apex-snapshot-create.sh
index 4647e0670..f2e61f22d 100644
--- a/jjb/apex/apex-snapshot-create.sh
+++ b/jjb/apex/apex-snapshot-create.sh
@@ -63,10 +63,11 @@ for node in $nodes; do
   fi
 done
 
+pushd ${tmp_dir} > /dev/null
 echo "Gathering virsh definitions"
 # copy qcow2s, virsh definitions
 for node in $nodes; do
-  cp -f /var/lib/libvirt/images/${node}.qcow2 ./
+  sudo cp -f /var/lib/libvirt/images/${node}.qcow2 ./
   sudo virsh dumpxml ${node} > ${node}.xml
 done
 
@@ -79,7 +80,7 @@ done
 DATE=`date +%Y-%m-%d`
 tar czf ../apex-csit-snap-${DATE}.tar.gz .
 popd > /dev/null
-rm -rf ./.tmp
+sudo rm -rf ${tmp_dir}
 echo "Snapshot saved as apex-csit-snap-${DATE}.tar.gz"
 
 # update opnfv properties file