summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-21 15:36:13 +0100
committerErik Johnston <erik@matrix.org>2016-04-21 15:36:13 +0100
commit59698906eb6495f15339f39d59d2ff26bef0ab37 (patch)
tree923b9881437f27651a5be017e5ec5c4f4d0f5d08
parentMerge pull request #740 from matrix-org/erikj/state_cache (diff)
downloadsynapse-59698906eb6495f15339f39d59d2ff26bef0ab37.tar.xz
Make jenkins install lxml
-rwxr-xr-xjenkins-postgres.sh1
-rwxr-xr-xjenkins-sqlite.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh

index 9ac86d2593..9a78480dd8 100755 --- a/jenkins-postgres.sh +++ b/jenkins-postgres.sh
@@ -26,6 +26,7 @@ tox --notest -e py27 TOX_BIN=$WORKSPACE/.tox/py27/bin $TOX_BIN/pip install psycopg2 +$TOX_BIN/pip install lxml : ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"} diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh
index 345d01936c..5500f8d8d6 100755 --- a/jenkins-sqlite.sh +++ b/jenkins-sqlite.sh
@@ -24,6 +24,7 @@ rm .coverage* || echo "No coverage files to remove" tox --notest -e py27 TOX_BIN=$WORKSPACE/.tox/py27/bin +$TOX_BIN/pip install lxml : ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"}