deploy.sh: make sure git is installed

This commit is contained in:
Marc 2014-10-04 21:29:05 +00:00
parent e98bfcfcc9
commit f29105b2d7
4 changed files with 24 additions and 4 deletions

View File

@ -12,7 +12,7 @@ from orchestra.utils.system import run
from orchestra.utils.tests import BaseLiveServerTestCase, random_ascii from orchestra.utils.tests import BaseLiveServerTestCase, random_ascii
from ... import backends, settings from ... import backends, settings
from ...models import Satabase from ...models import Database
class DatabaseTestMixin(object): class DatabaseTestMixin(object):

View File

@ -197,6 +197,7 @@ class DomainTestMixin(object):
self.addCleanup(partial(self.delete, self.domain_name)) self.addCleanup(partial(self.delete, self.domain_name))
self.update(self.domain_name, self.domain_update_records) self.update(self.domain_name, self.domain_update_records)
self.add(self.www_name, self.www_records) self.add(self.www_name, self.www_records)
time.sleep(1)
self.validate_update(self.MASTER_SERVER_ADDR, self.domain_name) self.validate_update(self.MASTER_SERVER_ADDR, self.domain_name)
time.sleep(5) time.sleep(5)
self.validate_update(self.SLAVE_SERVER_ADDR, self.domain_name) self.validate_update(self.SLAVE_SERVER_ADDR, self.domain_name)

View File

@ -157,7 +157,8 @@ function install_requirements () {
if $testing; then if $testing; then
APT="${APT} \ APT="${APT} \
iceweasel" iceweasel \
dnsutils"
PIP="${PIP} \ PIP="${PIP} \
selenium \ selenium \
xvfbwrapper \ xvfbwrapper \
@ -178,12 +179,30 @@ function install_requirements () {
run apt-get update run apt-get update
run apt-get install -y $APT run apt-get install -y $APT
run pip install $PIP run pip install $PIP --allow-external orchestra-orm --allow-unverified orchestra-orm
# Install ca certificates
if [[ ! -e /usr/local/share/ca-certificates/cacert.org ]]; then
mkdir -p /usr/local/share/ca-certificates/cacert.org
wget -P /usr/local/share/ca-certificates/cacert.org \
http://www.cacert.org/certs/root.crt \
http://www.cacert.org/certs/class3.crt
update-ca-certificates
fi
# Some versions of rabbitmq-server will not start automatically by default unless ... # Some versions of rabbitmq-server will not start automatically by default unless ...
sed -i "s/# Default-Start:.*/# Default-Start: 2 3 4 5/" /etc/init.d/rabbitmq-server sed -i "s/# Default-Start:.*/# Default-Start: 2 3 4 5/" /etc/init.d/rabbitmq-server
sed -i "s/# Default-Stop:.*/# Default-Stop: 0 1 6/" /etc/init.d/rabbitmq-server sed -i "s/# Default-Stop:.*/# Default-Stop: 0 1 6/" /etc/init.d/rabbitmq-server
run update-rc.d rabbitmq-server defaults run update-rc.d rabbitmq-server defaults
# Patch passlib
from collections import OrderedDict
IMPORT="from django.contrib.auth.hashers import mask_hash, _"
COLLECTIONS="from collections import OrderedDict"
sed -i "s/${IMPORT}, SortedDict/${IMPORT}\n ${COLLECTIONS}/" \
/usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py
sed -i "s/SortedDict/OrderedDict/g" \
/usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py
} }
export -f install_requirements export -f install_requirements

View File

@ -51,7 +51,7 @@ if [[ ! $CURRENT_VERSION ]]; then
run "cp $HOME/django-orchestra/orchestra/bin/orchestra-admin /usr/local/bin/" run "cp $HOME/django-orchestra/orchestra/bin/orchestra-admin /usr/local/bin/"
fi fi
sudo orchestra-admin install_requirements sudo orchestra-admin install_requirements --testing
if [[ ! -e $BASE_DIR ]]; then if [[ ! -e $BASE_DIR ]]; then
cd $HOME cd $HOME