From: Tim Rozet <trozet@redhat.com>
Date: Wed, 17 Aug 2016 04:08:50 +0000 (+0000)
Subject: Revert "enabling apex mock-detached deploy state"
X-Git-Tag: colorado.1.0~159^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fa9e92c1563a3560205484e6eccab7aea8384edb;p=releng.git

Revert "enabling apex mock-detached deploy state"

This reverts commit 43b81b7c3330a5f27dd640a871ea579957f8fc2b.

Change-Id: I0913c10ea6d597f20512cc59e9b66c76688b9529
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 24ed84840..c6cfb26d1 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -72,7 +72,6 @@ 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"
@@ -130,7 +129,6 @@ 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"
@@ -139,7 +137,6 @@ 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
@@ -193,12 +190,8 @@ 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 "--------------------------------------------------------"