summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-17 04:10:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-17 04:10:18 +0000
commitb3f1bdf8725c5b5fd6df02d165503c6220aec2f4 (patch)
treeef83d77abf69ea741601114046a5aa1ee5595f32
parent7b0c24f136c00fd6a13b08c18f10b2a22466bc53 (diff)
parentfa9e92c1563a3560205484e6eccab7aea8384edb (diff)
Merge "Revert "enabling apex mock-detached deploy state""
-rwxr-xr-xjjb/apex/apex-deploy.sh7
1 files changed, 0 insertions, 7 deletions
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 "--------------------------------------------------------"