Apex: Adds powering off nodes to clean 43/19943/1
authorTim Rozet <trozet@redhat.com>
Wed, 31 Aug 2016 01:48:40 +0000 (21:48 -0400)
committerTim Rozet <trozet@redhat.com>
Wed, 31 Aug 2016 01:48:40 +0000 (21:48 -0400)
Change-Id: Icaa3160bf9b96e323e448f66abe3a203e202c090
Signed-off-by: Tim Rozet <trozet@redhat.com>
jjb/apex/apex-deploy.sh

index c6cfb26..0e39854 100755 (executable)
@@ -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