diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 000000000..8083f4dc3 --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,49 @@ +- project: + templates: + - openstack-python-jobs-neutron + - check-requirements + - publish-openstack-sphinx-docs + - openstack-python35-jobs-neutron + check: + jobs: + - build-openstack-sphinx-docs: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + - openstack-tox-pep8: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + - openstack-tox-py27: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + - openstack-tox-py35: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + gate: + jobs: + - build-openstack-sphinx-docs: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + - openstack-tox-pep8: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + - openstack-tox-py27: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + - openstack-tox-py35: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + post: + jobs: + - publish-openstack-python-branch-tarball: + required-projects: + - openstack/networking-sfc + - openstack/neutron-dynamic-routing + diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index 1e1ce19d4..000000000 --- a/tools/tox_install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# Many of neutron's repos suffer from the problem of depending on neutron, -# but it not existing on pypi. - -# This wrapper for tox's package installer will use the existing package -# if it exists, else use zuul-cloner if that program exists, else grab it -# from neutron master via a hard-coded URL. That last case should only -# happen with devs running unit tests locally. - -# From the tox.ini config page: -# install_command=ARGV -# default: -# pip install {opts} {packages} -set -ex - -DIR=$(dirname $0) -${DIR}/tox_install_project.sh neutron neutron $* -${DIR}/tox_install_project.sh networking-sfc networking_sfc $* -CONSTRAINTS_FILE=$1 -shift - -install_cmd="pip install" -if [ $CONSTRAINTS_FILE != "unconstrained" ]; then - install_cmd="$install_cmd -c$CONSTRAINTS_FILE" -fi - -$install_cmd -U $* -exit $? diff --git a/tox.ini b/tox.ini index c575ce392..9c33e36a4 100644 --- a/tox.ini +++ b/tox.ini @@ -10,9 +10,12 @@ setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 PYTHONWARNINGS=default::DeprecationWarning usedevelop = True -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {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 + https://tarballs.openstack.org/neutron/neutron-11.0.0.tar.gz#egg=neutron + https://tarballs.openstack.org/networking-sfc/networking-sfc-5.0.0.tar.gz#egg=networking-sfc whitelist_externals = sh /bin/rm commands = /bin/rm -f .testrepository/times.dbm ostestr '{posargs}'