Merge "leverage token_check only when posting results"

[releng.git] / jjb / apex / apex-deploy.sh

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 6de12d4..a79c9e7 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -38,7 +38,7 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
   NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
   DEPLOY_CMD="opnfv-deploy --image-dir ${WORKSPACE}/.build"
-  CLEAN_CMD="${WORKSPACE}/ci/clean.sh"
+  CLEAN_CMD="opnfv-clean"
   RESOURCES="${WORKSPACE}/.build/"
   CONFIG="${WORKSPACE}/build"
   BASE=$CONFIG
@@ -49,11 +49,10 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   # TODO(trozet) add verification here
 
   # Install dev build
-  mkdir -p ~/tmp
-  rm -rf ~/tmp/.build
-  mv -f .build ~/tmp/
+  sudo rm -rf /tmp/.build
+  mv -f .build /tmp/
   sudo pip3 install --upgrade --force-reinstall .
-  mv -f ~/tmp/.build .
+  mv -f /tmp/.build ${WORKSPACE}/
 else
   DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
   NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"