diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-08-09 10:51:56 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-08-11 10:33:14 -0400 |
| commit | 43b81b7c3330a5f27dd640a871ea579957f8fc2b (patch) | |
| tree | 18e4f9e8325b78818dc9327a4a0fed9b3c6ca41c | |
| parent | 6d98467d60f1215290f52c6093e18e27805bf52d (diff) | |
enabling apex mock-detached deploy state
Signed-off-by: Dan Radez <dradez@redhat.com>
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index c6cfb26d1..24ed84840 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -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 "--------------------------------------------------------" |