Skip to content

Commit 90230c3

Browse files
author
Dean Troyer
committed
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
1 parent 21212ca commit 90230c3

2 files changed

Lines changed: 51 additions & 6 deletions

File tree

.zuul.yaml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
- job:
2+
name: osc-tox-unit-tips
3+
parent: openstack-tox
4+
description: |
5+
Run unit tests for OpenStackClient with master branch of important libs.
6+
7+
Uses tox with the ``unit-tips`` environment and master branch of
8+
the required-projects below.
9+
irrelevant-files:
10+
- ^.*\.rst$
11+
- ^doc/.*$
12+
- ^releasenotes/.*$
13+
required-projects:
14+
- openstack/os-client-config
15+
- openstack/osc-lib
16+
- openstack/python-openstackclient
17+
- openstack/python-openstacksdk
18+
vars:
19+
tox_envlist: unit-tips
20+
121
- job:
222
name: osc-functional-devstack-base
323
parent: devstack
@@ -11,6 +31,10 @@
1131
roles:
1232
- zuul: openstack-infra/devstack
1333
timeout: 9000
34+
irrelevant-files:
35+
- ^.*\.rst$
36+
- ^doc/.*$
37+
- ^releasenotes/.*$
1438
vars:
1539
devstack_localrc:
1640
SWIFT_HASH: "1234123412341234"
@@ -114,13 +138,17 @@
114138
- openstackclient-plugin-jobs
115139
check:
116140
jobs:
141+
- osc-tox-unit-tips:
142+
# The functional-tips job only tests the latest and shouldn't be run
143+
# on the stable branches
144+
branches: ^(?!stable)
117145
- osc-functional-devstack
118-
- osc-functional-devstack-n-net:
119-
voting: false
120-
# The job testing nova-network no longer works before Pike, and
121-
# should be disabled until the New Way of testing against old clouds
122-
# is ready and backported
123-
branches: ^(?!stable/(newton|ocata)).*$
146+
# - osc-functional-devstack-n-net:
147+
# voting: false
148+
# # The job testing nova-network no longer works before Pike, and
149+
# # should be disabled until the New Way of testing against old clouds
150+
# # is ready and backported
151+
# branches: ^(?!stable/(newton|ocata)).*$
124152
- osc-functional-devstack-tips:
125153
voting: false
126154
# The functional-tips job only tests the latest and shouldn't be run

tox.ini

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,23 @@ commands =
5353
commands =
5454
bandit -r openstackclient -x tests -s B105,B106,B107,B401,B404,B603,B606,B607,B110,B605,B101
5555

56+
[testenv:unit-tips]
57+
usedevelop = True
58+
install_command =
59+
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
60+
setenv = VIRTUAL_ENV={envdir}
61+
OS_STDOUT_CAPTURE=1
62+
OS_STDERR_CAPTURE=1
63+
OS_TEST_TIMEOUT=60
64+
deps = -r{toxinidir}/test-requirements.txt
65+
commands =
66+
pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
67+
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
68+
pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
69+
pip freeze
70+
ostestr {posargs}
71+
whitelist_externals = ostestr
72+
5673
[testenv:functional]
5774
setenv = OS_TEST_PATH=./openstackclient/tests/functional
5875
passenv = OS_*

0 commit comments

Comments
 (0)