From 0ccb2434dc7bbafa2d5e60ec5777dd03b00bc258 Mon Sep 17 00:00:00 2001
From: baigk <baiguoku@huawei.com>
Date: Sun, 27 Dec 2015 21:23:33 +0800
Subject: support redeploy

JIRA: COMPASS-216

Change-Id: Ide78ac82c1615259eeb7093c7a4485fbe493c6d9
Signed-off-by: baigk <baiguoku@huawei.com>
---
 deploy.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'deploy.sh')

diff --git a/deploy.sh b/deploy.sh
index b95475b1..653eec85 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,18 +2,16 @@
 COMPASS_DIR=`cd ${BASH_SOURCE[0]%/*}/;pwd`
 export COMPASS_DIR
 
-if [[ -z "$DEPLOY_STEP" ]]; then
-    export DEPLOY_STEP="all"
+if [[ -z $DEPLOY_COMPASS && -z $DEPLOY_HOST && -z $REDEPLOY_HOST ]]; then
+    export DEPLOY_COMPASS="true"
+    export DEPLOY_HOST="true"
 fi
 
-for i in python-cheetah python-yaml screen; do
+for i in python-cheetah python-yaml; do
     if [[ `dpkg-query -l $i` == 0 ]]; then
         continue
     fi
     sudo apt-get install -y --force-yes  $i
 done
 
-screen -ls |grep deploy|awk -F. '{print $1}'|xargs kill -9
-screen -wipe
-#screen -dmSL deploy bash $COMPASS_DIR/ci/launch.sh $*
 $COMPASS_DIR/deploy/launch.sh $*
-- 
cgit 1.2.3-korg