diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-09-08 14:57:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-08 14:57:39 +0000 |
| commit | e65ed372ee84b1f634ec24002fb7bfd7d48fd7e7 (patch) | |
| tree | b56c3f4dae40c8efab7ddf177c7ae9475d7cf16e /compass/ci/deploy.sh | |
| parent | 7f8c963b4dbcc1e57e97e2637ad5a639594319fa (diff) | |
| parent | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (diff) | |
Merge "Merge branch 'master' into merge-master-arno" into stable/arno
Diffstat (limited to 'compass/ci/deploy.sh')
| -rwxr-xr-x | compass/ci/deploy.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/compass/ci/deploy.sh b/compass/ci/deploy.sh index fe754aa..197bf63 100755 --- a/compass/ci/deploy.sh +++ b/compass/ci/deploy.sh @@ -1,5 +1,9 @@ -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -CONF_NAME=$1 -source ${SCRIPT_DIR}/../deploy/prepare.sh || exit $? -source ${SCRIPT_DIR}/../deploy/setup-env.sh || exit $? -source ${SCRIPT_DIR}/../deploy/deploy-vm.sh || exit $? +#set -x +COMPASS_DIR=`cd ${BASH_SOURCE[0]%/*}/../;pwd` +export COMPASS_DIR + +apt-get install screen +screen -ls |grep deploy|awk -F. '{print $1}'|xargs kill -9 +screen -wipe +#screen -dmSL deploy bash $COMPASS_DIR/ci/launch.sh $* +$COMPASS_DIR/ci/launch.sh $* |