Zuul job updates

* Add unit-tips job to run unit tests with the same project master branches
  as the functional-tips job (mostly useful for the unit.integ tests)
* Add irrelevant-files to the osc-functional-devstack-base job
* Comment out the functional-n-net job as it is horribly broken for now
  until the replacement package-installed OpenStack is ready

Change-Id: I5acdcb0a2f0f0dfe488740ae0add36366cc0ee21
This commit is contained in:
Dean Troyer 2017-10-27 12:40:16 -05:00
parent 21212cabd5
commit 90230c3766
2 changed files with 51 additions and 6 deletions

View File

@ -1,3 +1,23 @@
- job:
name: osc-tox-unit-tips
parent: openstack-tox
description: |
Run unit tests for OpenStackClient with master branch of important libs.
Uses tox with the ``unit-tips`` environment and master branch of
the required-projects below.
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
required-projects:
- openstack/os-client-config
- openstack/osc-lib
- openstack/python-openstackclient
- openstack/python-openstacksdk
vars:
tox_envlist: unit-tips
- job: - job:
name: osc-functional-devstack-base name: osc-functional-devstack-base
parent: devstack parent: devstack
@ -11,6 +31,10 @@
roles: roles:
- zuul: openstack-infra/devstack - zuul: openstack-infra/devstack
timeout: 9000 timeout: 9000
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
vars: vars:
devstack_localrc: devstack_localrc:
SWIFT_HASH: "1234123412341234" SWIFT_HASH: "1234123412341234"
@ -114,13 +138,17 @@
- openstackclient-plugin-jobs - openstackclient-plugin-jobs
check: check:
jobs: jobs:
- osc-tox-unit-tips:
# The functional-tips job only tests the latest and shouldn't be run
# on the stable branches
branches: ^(?!stable)
- osc-functional-devstack - osc-functional-devstack
- osc-functional-devstack-n-net: # - osc-functional-devstack-n-net:
voting: false # voting: false
# The job testing nova-network no longer works before Pike, and # # The job testing nova-network no longer works before Pike, and
# should be disabled until the New Way of testing against old clouds # # should be disabled until the New Way of testing against old clouds
# is ready and backported # # is ready and backported
branches: ^(?!stable/(newton|ocata)).*$ # branches: ^(?!stable/(newton|ocata)).*$
- osc-functional-devstack-tips: - osc-functional-devstack-tips:
voting: false voting: false
# The functional-tips job only tests the latest and shouldn't be run # The functional-tips job only tests the latest and shouldn't be run

17
tox.ini
View File

@ -53,6 +53,23 @@ commands =
commands = commands =
bandit -r openstackclient -x tests -s B105,B106,B107,B401,B404,B603,B606,B607,B110,B605,B101 bandit -r openstackclient -x tests -s B105,B106,B107,B401,B404,B603,B606,B607,B110,B605,B101
[testenv:unit-tips]
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}
setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_CAPTURE=1
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
deps = -r{toxinidir}/test-requirements.txt
commands =
pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
pip freeze
ostestr {posargs}
whitelist_externals = ostestr
[testenv:functional] [testenv:functional]
setenv = OS_TEST_PATH=./openstackclient/tests/functional setenv = OS_TEST_PATH=./openstackclient/tests/functional
passenv = OS_* passenv = OS_*