diff options
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | deploy.sh | 2 | ||||
| -rwxr-xr-x | deploy/prepare.sh | 6 |
4 files changed, 6 insertions, 6 deletions
@@ -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 $* @@ -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 |