Skip to content

Commit 01d3b42

Browse files
committed
Make py27 and py35 versions and template of unit-tips jobs
Make py27 and py35 versions of the tips job, and a project-template to hold them so it's easy for other projects to use both (or more, we ever add them) The base tox job knows how to install siblings based on required-projects, which makes it easy to piggyback on them. Remove the irrelevant-files sections, as these are specified in the base openstack-tox jobs. Using the unit-tips or functional-tips tox env is no longer neccessary. For the gate it's actually important to not do the sibling processing by hand in tox as the base tox job version of the logic does all the right things to deal with constraints and whatnot. Leave them for local developer convenience. Leave the osc-tox-unit-tips job for now, since there are some other repos using it. Once we switch them to the template, we can remove the job. Change-Id: I599b18218c10cb08e508cca3b3bbc9c88b8f809c
1 parent b061b9c commit 01d3b42

1 file changed

Lines changed: 57 additions & 12 deletions

File tree

.zuul.yaml

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,50 @@
44
description: |
55
Run unit tests for OpenStackClient with master branch of important libs.
66
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/.*$
7+
Takes advantage of the base tox job's install-siblings feature.
8+
required-projects:
9+
- openstack/cliff
10+
- openstack/keystoneauth
11+
- openstack/os-client-config
12+
- openstack/osc-lib
13+
- openstack/python-openstackclient
14+
- openstack/python-openstacksdk
15+
vars:
16+
tox_envlist: py27
17+
# Set work dir to openstackclient so that if it's triggered by one of the
18+
# other repos the tests will run in the same place
19+
zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
20+
21+
- job:
22+
name: osc-tox-py27-tips
23+
parent: openstack-tox-py27
24+
description: |
25+
Run unit tests for OpenStackClient with master branch of important libs.
26+
27+
Takes advantage of the base tox job's install-siblings feature.
28+
# The job only tests the latest and shouldn't be run on the stable branches
29+
branches: ^(?!stable)
30+
required-projects:
31+
- openstack/cliff
32+
- openstack/keystoneauth
33+
- openstack/os-client-config
34+
- openstack/osc-lib
35+
- openstack/python-openstackclient
36+
- openstack/python-openstacksdk
37+
vars:
38+
# Set work dir to openstackclient so that if it's triggered by one of the
39+
# other repos the tests will run in the same place
40+
zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
41+
42+
- job:
43+
name: osc-tox-py35-tips
44+
parent: openstack-tox-py35
45+
description: |
46+
Run unit tests for OpenStackClient with master branch of important libs.
47+
48+
Takes advantage of the base tox job's install-siblings feature.
49+
# The job only tests the latest and shouldn't be run on the stable branches
50+
branches: ^(?!stable)
1351
required-projects:
1452
- openstack/cliff
1553
- openstack/keystoneauth
@@ -18,7 +56,6 @@
1856
- openstack/python-openstackclient
1957
- openstack/python-openstacksdk
2058
vars:
21-
tox_envlist: unit-tips
2259
# Set work dir to openstackclient so that if it's triggered by one of the
2360
# other repos the tests will run in the same place
2461
zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
@@ -137,18 +174,26 @@
137174
s-container: false
138175
s-object: false
139176
s-proxy: false
140-
tox_envlist: functional-tips
177+
tox_envlist: functional
178+
179+
- project-template:
180+
name: osc-tox-unit-tips
181+
check:
182+
jobs:
183+
- osc-tox-py27-tips
184+
- osc-tox-py35-tips
185+
gate:
186+
jobs:
187+
- osc-tox-py27-tips
188+
- osc-tox-py35-tips
141189

142190
- project:
143191
name: openstack/python-openstackclient
144192
templates:
145193
- openstackclient-plugin-jobs
194+
- osc-tox-unit-tips
146195
check:
147196
jobs:
148-
- osc-tox-unit-tips:
149-
# The functional-tips job only tests the latest and shouldn't be run
150-
# on the stable branches
151-
branches: ^(?!stable)
152197
- osc-functional-devstack
153198
# - osc-functional-devstack-n-net:
154199
# voting: false

0 commit comments

Comments
 (0)