Clean up bindep.txt file
With zuulv3, we are now using bindep.txt more to manage build-wheel-jobs. As such, give an update to start supporting centos-7. I've also cleaned up a few depedencies we no longer need. This also add support to test wheel-mirror builds. Change-Id: Ia6c1113d119b01e7189e4ada41e10865c4ec0066 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
1619adbc28
commit
950c6cd74a
@ -2,6 +2,15 @@
|
|||||||
name: openstack/requirements
|
name: openstack/requirements
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
- build-wheel-mirror-centos-7:
|
||||||
|
files:
|
||||||
|
- bindep.txt
|
||||||
|
- build-wheel-mirror-ubuntu-trusty:
|
||||||
|
files:
|
||||||
|
- bindep.txt
|
||||||
|
- build-wheel-mirror-ubuntu-xenial:
|
||||||
|
files:
|
||||||
|
- bindep.txt
|
||||||
- openstack-tox-validate
|
- openstack-tox-validate
|
||||||
- requirements-tox-babel
|
- requirements-tox-babel
|
||||||
- requirements-tox-py27-check-uc
|
- requirements-tox-py27-check-uc
|
||||||
@ -33,6 +42,15 @@
|
|||||||
gate:
|
gate:
|
||||||
queue: integrated
|
queue: integrated
|
||||||
jobs:
|
jobs:
|
||||||
|
- build-wheel-mirror-centos-7:
|
||||||
|
files:
|
||||||
|
- bindep.txt
|
||||||
|
- build-wheel-mirror-ubuntu-trusty:
|
||||||
|
files:
|
||||||
|
- bindep.txt
|
||||||
|
- build-wheel-mirror-ubuntu-xenial:
|
||||||
|
files:
|
||||||
|
- bindep.txt
|
||||||
- openstack-tox-validate
|
- openstack-tox-validate
|
||||||
- requirements-tox-babel
|
- requirements-tox-babel
|
||||||
- requirements-tox-py27-check-uc
|
- requirements-tox-py27-check-uc
|
||||||
|
74
bindep.txt
74
bindep.txt
@ -1,45 +1,65 @@
|
|||||||
# These are needed to build all the things in global-requirements, which we do
|
# These are needed to build all the things in global-requirements, which we do
|
||||||
# for integration testing. (see tools/integration.sh)
|
# for integration testing. (see tools/integration.sh)
|
||||||
python-all-dev
|
|
||||||
python3-all-dev
|
krb5-devel [platform:redhat]
|
||||||
libvirt-dev
|
libffi-dev [platform:dpkg]
|
||||||
libxml2-dev
|
libffi-devel [platform:redhat]
|
||||||
libxslt1-dev
|
libkrb5-dev [platform:dpkg]
|
||||||
libmysqlclient-dev
|
libldap2-dev [platform:dpkg]
|
||||||
libpq-dev
|
libmysqlclient-dev [platform:dpkg]
|
||||||
pkg-config
|
libnss3-dev [platform:dpkg]
|
||||||
libsqlite3-dev
|
libpq-dev [platform:dpkg]
|
||||||
libzmq-dev
|
libsasl2-dev [platform:dpkg]
|
||||||
libffi-dev
|
libsqlite3-dev [platform:dpkg]
|
||||||
libldap2-dev
|
libuuid-devel [platform:rpm]
|
||||||
libkrb5-dev
|
libvirt-dev [platform:dpkg]
|
||||||
libsasl2-dev
|
libvirt-devel [platform:redhat]
|
||||||
ccache
|
libxml2-dev [platform:dpkg]
|
||||||
pypy
|
libxml2-devel [platform:rpm]
|
||||||
pypy-dev
|
libxslt-devel [platform:rpm]
|
||||||
# NOTE(flaper87): Temporarily needed for proton
|
libxslt1-dev [platform:dpkg]
|
||||||
uuid-dev
|
libzmq-dev [platform:dpkg]
|
||||||
|
mariadb-devel [platform:redhat]
|
||||||
|
mozilla-nss-devel [platform:suse]
|
||||||
|
nss-devel [platform:redhat]
|
||||||
|
openssl-devel [platform:redhat]
|
||||||
|
openldap-devel [platform:redhat]
|
||||||
|
pkg-config [platform:dkpg]
|
||||||
|
pkgconfig [platform:redhat]
|
||||||
|
postgresql-devel [platform:redhat]
|
||||||
|
pypy [platform:dpkg]
|
||||||
|
pypy-dev [platform:dpkg]
|
||||||
|
# Note that python3-all-dev includes python3-all, added
|
||||||
|
# both here for documentary purpose.
|
||||||
|
python3-all-dev [platform:dpkg]
|
||||||
|
python3-all [platform:dpkg]
|
||||||
|
python-all-dev [platform:dpkg]
|
||||||
|
python-devel [platform:rpm]
|
||||||
swig
|
swig
|
||||||
|
systemd-devel [platform:redhat]
|
||||||
|
uuid-dev [platform:dpkg]
|
||||||
|
|
||||||
# Python things that change rarely and we're willing to risk breakage vs latest
|
# Python things that change rarely and we're willing to risk breakage vs latest
|
||||||
python-numpy [python]
|
python-numpy [python]
|
||||||
python-yaml [python]
|
python-yaml [python]
|
||||||
|
|
||||||
# NOTE(jaegerandi): Temporarily needed for running as part of
|
# NOTE(jaegerandi): Temporarily needed for running as part of
|
||||||
# OpenStack gates:
|
# OpenStack gates:
|
||||||
mysql-client
|
# TODO(pabelanger): Remove in follow up patch.
|
||||||
mysql-server
|
mysql-client [platform:dpkg]
|
||||||
|
mysql-server [platform:dpkg]
|
||||||
postgresql
|
postgresql
|
||||||
postgresql-client
|
postgresql-client [platform:dpkg]
|
||||||
# NOTE(toabctl): libnss3-dev is needed for python-nss
|
|
||||||
# which is used by dogtag-pki
|
|
||||||
libnss3-dev [platform:dpkg]
|
|
||||||
mozilla-nss-devel [platform:rpm]
|
|
||||||
nss-devel [platform:rpm]
|
|
||||||
# NOTE(dirk) needed for PyECLib
|
# NOTE(dirk) needed for PyECLib
|
||||||
liberasurecode-dev [platform:dpkg]
|
liberasurecode-dev [platform:dpkg]
|
||||||
liberasurecode-devel [platform:rpm]
|
liberasurecode-devel [platform:rpm]
|
||||||
dev-libs/liberasurecode [platform:gentoo]
|
dev-libs/liberasurecode [platform:gentoo]
|
||||||
libsystemd-dev [platform:dpkg !platform:ubuntu-trusty]
|
libsystemd-dev [platform:dpkg !platform:ubuntu-trusty]
|
||||||
libsystemd-journal-dev [platform:ubuntu-trusty]
|
libsystemd-journal-dev [platform:ubuntu-trusty]
|
||||||
|
|
||||||
# NOTE(pabelanger): Needed for build-wheel-mirror jobs
|
# NOTE(pabelanger): Needed for build-wheel-mirror jobs
|
||||||
gawk [test]
|
gawk [test]
|
||||||
|
# NOTE(pabelanger): You must first enable epel to install parallel RPM on
|
||||||
|
# centos-7.
|
||||||
parallel [test]
|
parallel [test]
|
||||||
|
11
tox.ini
11
tox.ini
@ -53,6 +53,17 @@ commands = bash -c "find {toxinidir}/tools \
|
|||||||
-name \*.sh \
|
-name \*.sh \
|
||||||
-print0 | xargs -0 bashate -v -iE006,E010"
|
-print0 | xargs -0 bashate -v -iE006,E010"
|
||||||
|
|
||||||
|
[testenv:bindep]
|
||||||
|
# Do not install any requirements. We want this to be fast and work even if
|
||||||
|
# system dependencies are missing, since it's used to tell you what system
|
||||||
|
# dependencies are missing! This also means that bindep must be installed
|
||||||
|
# separately, outside of the requirements files, and develop mode disabled
|
||||||
|
# explicitly to avoid unnecessarily installing the checked-out repo too (this
|
||||||
|
# further relies on "tox.skipsdist = True" above).
|
||||||
|
deps = bindep
|
||||||
|
commands = bindep test
|
||||||
|
usedevelop = False
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
commands = python setup.py build_sphinx
|
commands = python setup.py build_sphinx
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user