X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-snapshot-create.sh;h=f146dd8106e0945c8f4af9699d89396e4262222c;hb=0ddfff32a990dda5a487229641aa189161f3d25a;hp=09c6a11970f032ac086f206d27c49a6805b42d17;hpb=2590b3c452a5b8e6bd95dbd3f6daecc12a9fc20d;p=releng.git

diff --git a/jjb/apex/apex-snapshot-create.sh b/jjb/apex/apex-snapshot-create.sh
index 09c6a1197..f146dd810 100644
--- a/jjb/apex/apex-snapshot-create.sh
+++ b/jjb/apex/apex-snapshot-create.sh
@@ -26,17 +26,18 @@ mkdir -p ${tmp_dir}
 pushd ${tmp_dir} > /dev/null
 echo "Copying overcloudrc and ssh key from Undercloud..."
 # Store overcloudrc
-UNDERCLOUD=$(sudo virsh domifaddr undercloud | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]')
-scp ${SSH_OPTIONS[@]} stack@${UNDERCLOUD}:overcloudrc ./
+UNDERCLOUD=$(sudo virsh domifaddr undercloud | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+')
+sudo scp ${SSH_OPTIONS[@]} stack@${UNDERCLOUD}:overcloudrc ./
 # Copy out ssh key of stack from undercloud
-scp ${SSH_OPTIONS[@]} stack@${UNDERCLOUD}:.ssh/id_rsa ./
+sudo scp ${SSH_OPTIONS[@]} stack@${UNDERCLOUD}:.ssh/id_rsa ./
 popd > /dev/null
 
 echo "Gathering introspection information"
 git clone https://gerrit.opnfv.org/gerrit/sdnvpn.git
 pushd sdnvpn/odl-pipeline/lib > /dev/null
-./tripleo_introspector.sh --out-file ${tmp_dir}/node.yaml
+sudo ./tripleo_introspector.sh --out-file ${tmp_dir}/node.yaml
 popd > /dev/null
+sudo rm -rf sdnvpn
 
 echo "Shutting down nodes"
 # Shut down nodes
@@ -63,10 +64,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
 
@@ -75,11 +77,13 @@ for net in admin api external storage tenant; do
   sudo virsh net-dumpxml ${net} > ${net}.xml
 done
 
+sudo chown jenkins-ci:jenkins-ci *
+
 # tar up artifacts
 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