diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..6799c8b --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,19 @@ +- job: + name: os-api-ref-nova-src + parent: build-openstack-api-ref + description: | + Run the api-ref job against nova with proposed os-api-ref change. + vars: + zuul_work_dir: src/git.openstack.org/openstack/nova + required-projects: + - openstack/nova + - openstack/os-api-ref + +- project: + name: openstack/os-api-ref + check: + jobs: + - os-api-ref-nova-src + gate: + jobs: + - os-api-ref-nova-src diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index e61b63a..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 $? diff --git a/tox.ini b/tox.ini index f549054..b99a9d3 100644 --- a/tox.ini +++ b/tox.ini @@ -6,10 +6,10 @@ skipsdist = True [testenv] setenv = VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=os-api-ref -install_command = {toxinidir}/tools/tox_install.sh {toxinidir}/upper-constraints.txt {opts} {packages} -deps = -r{toxinidir}/requirements.txt +install_command = pip install -U {opts} {packages} +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py test --slowest --no-parallel --testr-args='{posargs}'