fix CI configuration issues
* update tox settings to work with constraints files * add files assumed to be present by the doc build jobs but that aren't actually needed (so they are empty) Change-Id: Ib7ea278f9dab502bc6f23af8d2dc1c37d2772977 Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
parent
caaac8bc09
commit
c323784ef3
0
doc/source/_extra/.htaccess
Normal file
0
doc/source/_extra/.htaccess
Normal file
0
doc/test/redirect-tests.txt
Normal file
0
doc/test/redirect-tests.txt
Normal file
30
tools/tox_install.sh
Executable file
30
tools/tox_install.sh
Executable file
@ -0,0 +1,30 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Client constraint file contains this client version pin that is in conflict
|
||||||
|
# with installing the client from source. We should remove the version pin in
|
||||||
|
# the constraints file before applying it for from-source installation.
|
||||||
|
|
||||||
|
CONSTRAINTS_FILE="$1"
|
||||||
|
shift 1
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
|
||||||
|
# published to logs.openstack.org for easy debugging.
|
||||||
|
localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
|
||||||
|
|
||||||
|
if [[ "$CONSTRAINTS_FILE" != http* ]]; then
|
||||||
|
CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
|
||||||
|
fi
|
||||||
|
# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
|
||||||
|
curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
|
||||||
|
|
||||||
|
pip install -c"$localfile" openstack-requirements
|
||||||
|
|
||||||
|
# This is the main purpose of the script: Allow local installation of
|
||||||
|
# the current repo. It is listed in constraints file and thus any
|
||||||
|
# install will be constrained and we need to unconstrain it.
|
||||||
|
edit-constraints "$localfile" -- "$CLIENT_NAME"
|
||||||
|
|
||||||
|
pip install -c"$localfile" -U "$@"
|
||||||
|
exit $?
|
7
tox.ini
7
tox.ini
@ -5,10 +5,11 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
PYTHONWARNINGS=default::DeprecationWarning
|
CLIENT_NAME=whereto
|
||||||
|
PYTHONWARNINGS=default::DeprecationWarning
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
python setup.py test --coverage --coverage-package-name=whereto --slowest --testr-args='{posargs}'
|
python setup.py test --coverage --coverage-package-name=whereto --slowest --testr-args='{posargs}'
|
||||||
|
Loading…
Reference in New Issue
Block a user