X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-deploy.sh;h=b8ae75a1f411d46ea2a684949e2dc354713d2b3c;hb=dc7000ff2c74bc5e91aadd3e48a25f8d2edccd4b;hp=a47e3a5db9b59831152af45a0c9c004945e2dd41;hpb=e7b945ff720d449112d73291ff9660d27b2f3183;p=releng.git diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index a47e3a5db..b8ae75a1f 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -10,8 +10,6 @@ echo "Starting the Apex deployment." echo "--------------------------------------------------------" echo -sudo rm -rf /tmp/tmp* - if [ -z "$DEPLOY_SCENARIO" ]; then echo "Deploy scenario not set!" exit 1 @@ -38,7 +36,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,10 +47,10 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then # TODO(trozet) add verification here # Install dev build - mkdir -p ~/tmp - 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/"