From 0521b615d19d8e6280f25d0ba0902b95e9777536 Mon Sep 17 00:00:00 2001
From: "carey.xu" <carey.xuhan@huawei.com>
Date: Thu, 10 Sep 2015 14:54:52 +0800
Subject: Disable confirm when package installing

Change-Id: I7d4ebfa96c3d30f839b68cd9b6de6967e763db13
JIRA: COMPASS-39
---
 build.sh          | 2 +-
 ci/deploy.sh      | 2 +-
 deploy.sh         | 2 +-
 deploy/prepare.sh | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index dd4e7a18..058c2053 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ function prepare_env()
     for i in createrepo genisoimage curl; do
         sudo $i --version >/dev/null 2>&1
         if [[ $? -ne 0 ]]; then
-            sudo apt-get install $i -y
+            sudo apt-get install  -y --force-yes  $i
         fi
     done
     set -e
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 197bf63b..f879f799 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -2,7 +2,7 @@
 COMPASS_DIR=`cd ${BASH_SOURCE[0]%/*}/../;pwd`
 export COMPASS_DIR
 
-apt-get install screen
+apt-get install -y --force-yes screen
 screen -ls |grep deploy|awk -F. '{print $1}'|xargs kill -9
 screen -wipe
 #screen -dmSL deploy bash $COMPASS_DIR/ci/launch.sh $*
diff --git a/deploy.sh b/deploy.sh
index ec50919e..4cfe89e8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -6,7 +6,7 @@ for i in python-cheetah python-yaml screen; do
     if [[ `dpkg-query -l $i` == 0 ]]; then
         continue
     fi
-    sudo apt-get install $i
+    sudo apt-get install -y --force-yes  $i
 done
 
 screen -ls |grep deploy|awk -F. '{print $1}'|xargs kill -9
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 704b540a..67fc4b65 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -19,9 +19,9 @@ function download_iso()
 function prepare_env() {
     export PYTHONPATH=/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/dist-packages
     sudo apt-get update -y
-    sudo apt-get install mkisofs bc curl
-    sudo apt-get install git python-pip python-dev -y
-    sudo apt-get install libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev -y
+    sudo apt-get install -y --force-yes mkisofs bc curl
+    sudo apt-get install -y --force-yes git python-pip python-dev
+    sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev
     sudo pip install --upgrade pip
     sudo pip install --upgrade ansible
     sudo pip install --upgrade virtualenv
-- 
cgit 1.2.3-korg