From d4768b31253e603c23dee77d09d80d84052dcc36 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Tue, 9 Aug 2016 21:46:22 +0000
Subject: Revert "enabling apex mock-detached deploy state"
This reverts commit 1d617af8d19f5c2715d21aa6a7ad969ca193ebc1.
Change-Id: I208b8daa34ed78440364a18876a498d8e0614c95
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
jjb/apex/apex-deploy.sh | 6 ------
1 file changed, 6 deletions(-)
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 7b012a633..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"
@@ -192,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 "--------------------------------------------------------"
--
cgit