X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-deploy.sh;h=d6bb4855510d22245f2fbd424d1167f87243e1de;hb=504fb4bc7d3d26f7442230a55a4d4410fe94b415;hp=2e00fae907daf69eac5558f4c933bd000ec94f11;hpb=302090eef8ae1ffbaf0d702821980b636f8464ff;p=releng.git

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 2e00fae90..d6bb48555 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -37,8 +37,11 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
   DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
   NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
   DEPLOY_CMD="${WORKSPACE}/ci/deploy.sh"
+  CLEAN_CMD="${WORKSPACE}/ci/clean.sh"
   RESOURCES="${WORKSPACE}/.build/"
   CONFIG="${WORKSPACE}/build"
+  BASE=$CONFIG
+  IMAGES=$RESOURCES
   LIB="${WORKSPACE}/lib"
 
   # Ensure artifacts were downloaded and extracted correctly
@@ -48,8 +51,11 @@ else
   DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
   NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"
   DEPLOY_CMD="opnfv-deploy"
+  CLEAN_CMD="opnfv-clean"
   RESOURCES="/var/opt/opnfv/images"
   CONFIG="/var/opt/opnfv"
+  BASE=$CONFIG
+  IMAGES=$RESOURCES
   LIB="/var/opt/opnfv/lib"
 
 fi
@@ -97,11 +103,7 @@ if [ "$OPNFV_CLEAN" == 'yes' ]; then
     clean_opts=''
   fi
 
-  if [[ "$ARTIFACT_VERSION" =~ "dev" ]]; then
-    sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh ${clean_opts}
-  else
-    sudo BASE=${BASE} LIB=${LIB} opnfv-clean ${clean_opts}
-  fi
+  sudo BASE=${BASE} LIB=${LIB} ${CLEAN_CMD} ${clean_opts}
 fi
 
 if echo ${DEPLOY_SCENARIO} | grep ipv6; then