summaryrefslogtreecommitdiffstats
path: root/jjb/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-30 21:48:40 -0400
committerTim Rozet <trozet@redhat.com>2016-08-30 21:48:40 -0400
commit853d2f9ba857c01f4be5973873f7d94051a818aa (patch)
tree21e32c134334e941857cea0faa89200e11de6738 /jjb/apex
parent3b0bcece3e95a3e020d0cfd9014219a075502fb1 (diff)
Apex: Adds powering off nodes to clean
Change-Id: Icaa3160bf9b96e323e448f66abe3a203e202c090 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex')
-rwxr-xr-xjjb/apex/apex-deploy.sh9
1 files changed, 7 insertions, 2 deletions
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