summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-09 21:47:44 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-09 21:47:44 +0000
commitf0830fb30a41e6db542ce7c843c5819fcb205c9e (patch)
tree8303fc492d2d45770bafc36676fb987652f94c7b
parent371208a73b91765ff3fcb29acac97c28e318c3d4 (diff)
parentd4768b31253e603c23dee77d09d80d84052dcc36 (diff)
Merge "Revert "enabling apex mock-detached deploy state""
-rwxr-xr-xjjb/apex/apex-deploy.sh6
1 files changed, 0 insertions, 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 "--------------------------------------------------------"