diff options
| author | Doug Hellmann <doug@doughellmann.com> | 2018-08-28 17:21:23 -0400 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2018-09-08 19:34:19 +0200 |
| commit | fdc7ba604f1cf624d5ff5b7dd597b8dec5790c60 (patch) | |
| tree | e1f968e67791275b2fff728d38d86d443b059815 | |
| parent | d558d6173970736fde63526da6824d391ada6042 (diff) | |
| download | python-heatclient-fdc7ba604f1cf624d5ff5b7dd597b8dec5790c60.tar.gz | |
import zuul job settings from project-config
This is a mechanically generated patch to complete step 1 of moving
the zuul job settings out of project-config and into each project
repository.
Because there will be a separate patch on each branch, the branch
specifiers for branch-specific jobs have been removed.
Because this patch is generated by a script, there may be some
cosmetic changes to the layout of the YAML file(s) as the contents are
normalized.
See the python3-first goal document for details:
https://governance.openstack.org/tc/goals/stein/python3-first.html
Remove tools/tox_install.sh, it breaks docs build and is not needed.
Change-Id: Ia67b1f43d96c71bb3199bac413fef99e105e6601
Story: #2002586
Task: #24298
| -rw-r--r-- | .zuul.yaml | 11 | ||||
| -rwxr-xr-x | tools/tox_install.sh | 28 | ||||
| -rw-r--r-- | tox.ini | 6 |
3 files changed, 15 insertions, 30 deletions
diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..0e4257f --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,11 @@ +- project: + templates: + - openstack-python-jobs + - openstack-python35-jobs + - check-requirements + - openstackclient-plugin-jobs + - publish-openstack-sphinx-docs + - release-notes-jobs + post: + jobs: + - openstack-tox-cover diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index e93c73b..0000000 --- a/tools/tox_install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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 - -localfile="$VIRTUAL_ENV/log/upper-constraints.txt" - -if [[ $CONSTRAINTS_FILE != http* ]]; then - CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE -fi - -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,8 +7,10 @@ skipsdist = True setenv = VIRTUAL_ENV={envdir} CLIENT_NAME=python-heatclient usedevelop = True -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} -deps = -r{toxinidir}/requirements.txt +install_command = pip install {opts} {packages} +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.py[c|o]" -delete python setup.py testr --slowest --testr-args='{posargs}' |