diff options
| author | Vieri <15050873171@163.com> | 2018-08-21 16:24:19 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2018-09-06 21:02:10 +0200 |
| commit | a0f2b4c4b446f1c7107ee5959686b11efff1de85 (patch) | |
| tree | 5b137695ca33b642d01cd17cb1d30587e72d3a94 | |
| parent | a20b0c702d2b0a598fddf1a5c659f60c818b1f7e (diff) | |
| download | os-client-config-a0f2b4c4b446f1c7107ee5959686b11efff1de85.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
To fix building docs, remove tools/tox_install.sh.
Change-Id: Ibf6d312c99cd8d9e572636b068a65d1613e506d6
Story: #2002586
Task: #24321
| -rw-r--r-- | .zuul.yaml | 8 | ||||
| -rwxr-xr-x | tools/tox_install.sh | 30 | ||||
| -rw-r--r-- | tox.ini | 7 |
3 files changed, 13 insertions, 32 deletions
diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..cbd1b4e --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,8 @@ +- project: + templates: + - check-requirements + - publish-openstack-sphinx-docs + - openstack-python-jobs + - openstack-python35-jobs + - lib-forward-testing + - release-notes-jobs diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index 43468e4..0000000 --- a/tools/tox_install.sh +++ /dev/null @@ -1,30 +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 - -# 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,12 +7,15 @@ skipsdist = True usedevelop = True passenv = ZUUL_CACHE_DIR REQUIREMENTS_PIP_LOCATION -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} {opts} {packages} +install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} BRANCH_NAME=master CLIENT_NAME=os-client-config -deps = -r{toxinidir}/test-requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] |