summaryrefslogtreecommitdiffstats
path: root/jjb/apex/apex-snapshot-deploy.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-02-10 17:05:00 -0500
committerTim Rozet <trozet@redhat.com>2017-02-10 17:05:00 -0500
commit85e1fd45a18dd9274827105ab5a2ec7e13d141f3 (patch)
treec2d63c445196950b31030630c3fbb909daa6dd58 /jjb/apex/apex-snapshot-deploy.sh
parenteb91c48bb99fa08acb23f2d47f7962ce8a8352e2 (diff)
Apex,CSIT: Fixes slaves and other bugs
Changes Include: - Fixes phase jobs to run on the same node - Removes using WORKSPACE/.tmp dir for unpacking snapshot since other phase jobs will need access to these files. Now just unpacks to cache directory - Fixes download for ODL. The previous way ODL was being downloaded was only if a manual patch-set job was run on the ODL gerrit. This patch changes the download to use the zip artifact automatically produced. - The zip artifact is converted to tar.gz and stored in /tmp/ for the install job to consume. Note: the conversion is done because the odl-pipeline install scripts only currently accept tar.gz. - Extra checks in install job to make sure required files exist and have been previously unpacked by deploy job. Change-Id: I38aad98cac247eb4af2839811388b119079bc7ba Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex/apex-snapshot-deploy.sh')
-rw-r--r--jjb/apex/apex-snapshot-deploy.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh
index b77755f91..773edd228 100644
--- a/jjb/apex/apex-snapshot-deploy.sh
+++ b/jjb/apex/apex-snapshot-deploy.sh
@@ -69,10 +69,9 @@ fi
echo "INFO: Snapshot to be used is ${snap_tar}"
-# create tmp directory and unpack snap
-mkdir -p ./tmp
-pushd ./tmp > /dev/null
-tar xvf ${SNAP_CACHE}/${snap_tar} -C ./
+# move to snap cache dir and unpack
+pushd ${SNAP_CACHE} > /dev/null
+tar xvf ${snap_tar}
# create each network
virsh_networks=$(ls *.xml | grep -v baremetal)