Merge "Revert "Move integration test dependencies into bindep""

other-requirements.txt

@@ -1,23 +0,0 @@
-# These are needed to build all the things in global-requirements, which we do
-# for integration testing (see tools/integration.sh.
-python-all-dev
-python3-all-dev
-libvirt-dev
-libxml2-dev
-libxslt-dev
-libmysqlclient-dev
-libpq-dev
-libnspr4-dev
-pkg-config
-libsqlite3-dev
-libzmq-dev
-libffi-dev
-libldap2-dev
-libsasl2-dev
-ccache
-# NOTE(flaper87): Temporarly needed for proton
-uuid-dev
-swig
-# Python things that change rarely and we're willing to risk breakage vs latest
-python-numpy [python]
-python-yaml [python]

tools/integration.sh

@@ -25,8 +25,15 @@ BASE=${BASE:-/opt/stack}
 
 REPODIR=${REPODIR:-$BASE/new}
 
-root=$(dirname $0)/..
-sudo apt-get install -y --force-yes $(/usr/bindep-env/bin/bindep -b python -f $root/other-requirements.txt)
+# TODO: Figure out how to get this on to the box properly
+sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libzmq-dev libffi-dev libldap2-dev libsasl2-dev ccache
+
+# NOTE(flaper87): Temporarly needed for proton
+sudo apt-get install -y --force-yes uuid-dev swig
+
+# FOR numpy / pyyaml
+sudo apt-get build-dep -y --force-yes python-numpy
+sudo apt-get build-dep -y --force-yes python-yaml
 
 # And use ccache explitly
 export PATH=/usr/lib/ccache:$PATH