enabling apex mock-detached deploy state 39/18439/1
authorDan Radez <dradez@redhat.com>
Tue, 9 Aug 2016 14:51:56 +0000 (10:51 -0400)
committerDan Radez <dradez@redhat.com>
Thu, 11 Aug 2016 14:33:14 +0000 (10:33 -0400)
Signed-off-by: Dan Radez <dradez@redhat.com>
jjb/apex/apex-deploy.sh

index c6cfb26..24ed848 100755 (executable)
@@ -72,6 +72,7 @@ if [[ "$BUILD_DIRECTORY" == *verify* ]]; then
     DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
     NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
     DEPLOY_CMD="$(pwd)/deploy.sh"
+    UTIL_CMD="$(pwd)/util.sh"
     RESOURCES="${WORKSPACE}/build/images/"
     CONFIG="${WORKSPACE}/build"
     LIB="${WORKSPACE}/lib"
@@ -129,6 +130,7 @@ else
 
     DEPLOY_CMD=opnfv-deploy
     DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
+    UTIL_CMD=opnfv-util
     NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"
     RESOURCES="/var/opt/opnfv/images"
     CONFIG="/var/opt/opnfv"
@@ -137,6 +139,7 @@ fi
 
 # set env vars to deploy cmd
 DEPLOY_CMD="CONFIG=${CONFIG} RESOURCES=${RESOURCES} LIB=${LIB} ${DEPLOY_CMD}"
+UTIL_CMD="CONFIG=${CONFIG} RESOURCES=${RESOURCES} LIB=${LIB} ${UTIL_CMD}"
 
 if [ "$OPNFV_CLEAN" == 'yes' ]; then
   if [[ "$BUILD_DIRECTORY" == *verify* ]]; then
@@ -190,8 +193,12 @@ if ! sudo test -e "$NETWORK_FILE"; then
   exit 1
 fi
 
+# mock detached state for deploy
+sudo $UTIL_CMD mock-detached on
 # start deployment
 sudo ${DEPLOY_CMD} -d ${DEPLOY_FILE} -n ${NETWORK_FILE} --debug
+# turn of mock detached state
+sudo $UTIL_CMD mock-detached off
 
 echo
 echo "--------------------------------------------------------"