diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-16 00:07:34 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-05-16 00:07:34 -0400 |
| commit | 7eb4f218222da336cb460deeffcf3cb6e39e9d07 (patch) | |
| tree | f88e680979b28920da1170431e8d6cf32e32cc12 /jjb/apex | |
| parent | f973b2d3dd421c520c8f91af17b09c88850b08e7 (diff) | |
Apex: fix clean cmds in deploy
Change-Id: I7da324903df1cc0c26cfba4433748dab459bbeb1
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 20b309b4a..d6bb48555 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -37,6 +37,7 @@ 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 @@ -50,6 +51,7 @@ 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 @@ -101,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 |