From 853d2f9ba857c01f4be5973873f7d94051a818aa Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 30 Aug 2016 21:48:40 -0400 Subject: Apex: Adds powering off nodes to clean Change-Id: Icaa3160bf9b96e323e448f66abe3a203e202c090 Signed-off-by: Tim Rozet --- jjb/apex/apex-deploy.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'jjb') diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index c6cfb26d1..0e3985486 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -139,10 +139,15 @@ fi DEPLOY_CMD="CONFIG=${CONFIG} RESOURCES=${RESOURCES} LIB=${LIB} ${DEPLOY_CMD}" if [ "$OPNFV_CLEAN" == 'yes' ]; then + if [ -f '/root/inventory/pod_settings.yaml' ]; then + clean_opts='-f /root/inventory/pod_settings.yaml' + else + clean_opts='' + fi if [[ "$BUILD_DIRECTORY" == *verify* ]]; then - sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh + sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh ${clean_opts} else - sudo CONFIG=${CONFIG} LIB=${LIB} opnfv-clean + sudo CONFIG=${CONFIG} LIB=${LIB} opnfv-clean ${clean_opts} fi fi -- cgit 1.2.3-korg