diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-05-20 04:53:26 +1200 |
|---|---|---|
| committer | Sachi King <nakato@nakato.io> | 2016-01-07 12:19:54 +1100 |
| commit | 474019d35be10117dbded09d7f72c26b57400c7c (patch) | |
| tree | 9b69c0455e83a738a6a5ee2ea8d190e1740ea849 | |
| parent | a67e2c346c5193cf36e381694d8fddb0d826df6b (diff) | |
| download | pbr-474019d35be10117dbded09d7f72c26b57400c7c.tar.gz | |
Add dependencies for building wheels
Add kerberos deps to build the kerberos wheel.
(cherry picked from commit e2ac0e00982ebcc772e75d2beb3a7896864c8be4)
--
Add python-qpid-proton deps to build the python-qpid-proton wheel.
--
Install openstack_requirements into venv for update.py
--
Don't test against non-kilo repos, as we are applying kilo requirements
Change-Id: I30fb4d816e050606c6bdde720adae4519e75167c
| -rw-r--r-- | tools/integration.sh | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tools/integration.sh b/tools/integration.sh index c03c6f3..5402c89 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -30,7 +30,7 @@ REPODIR=${REPODIR:-$BASE/new} # TODO: Figure out how to get this on to the box properly sudo apt-get update -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 +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 libkrb5-dev uuid-dev swig # FOR numpy / pyyaml sudo apt-get build-dep -y --force-yes python-numpy @@ -149,6 +149,10 @@ $epvenv/bin/test_cmd | grep 'Test cmd' projectdir=$tmpdir/projects mkdir -p $projectdir +requirementsvenv=$tmpdir/update +mkvenv $requirementsvenv +$requirementsvenv/bin/python -m pip install $REPODIR/requirements + for PROJECT in $PROJECTS ; do SHORT_PROJECT=$(basename $PROJECT) if ! grep 'pbr' $REPODIR/$SHORT_PROJECT/setup.py >/dev/null 2>&1 @@ -172,10 +176,20 @@ for PROJECT in $PROJECTS ; do # requirements doesn't really install continue fi + if [ $SHORT_PROJECT = 'keystoneauth-saml2' ]; then + # EOL - Repo dead + continue + fi + + pushd $REPODIR/$SHORT_PROJECT + if [ $(git rev-parse --abbrev-ref HEAD) != 'stable/kilo' ]; then + continue + fi + popd # set up the project synced with the global requirements sudo chown -R $USER $REPODIR/$SHORT_PROJECT - (cd $REPODIR/requirements && python update.py $REPODIR/$SHORT_PROJECT) + (cd $REPODIR/requirements && $requirementsvenv/bin/python update.py $REPODIR/$SHORT_PROJECT) pushd $REPODIR/$SHORT_PROJECT if ! git diff --quiet ; then git commit -a -m'Update requirements' |