opendev/system-config
Code Issues Proposed changes

Merge "Run pecan py33-scaffolds jobs on py3k-precise nodes."

Browse Source
This commit is contained in:
Jenkins 2014-07-28 22:42:59 +00:00 committed by Gerrit Code Review
commit 9d5953cdf7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
View File

@ -2471,7 +2471,7 @@
envlist: scaffolds-27 envlist: scaffolds-27
- gate-{name}-tox-{envlist}: - gate-{name}-tox-{envlist}:
envlist: scaffolds-33 envlist: scaffolds-33
node: bare-precise node: py3k-precise
- gate-{name}-tox-{envlist}: - gate-{name}-tox-{envlist}:
envlist: wsme-stable envlist: wsme-stable
- gate-{name}-tox-{envlist}: - gate-{name}-tox-{envlist}:

2
modules/openstack_project/files/zuul/openstack_functions.py
View File

@ -90,7 +90,7 @@ def set_node_options(item, job, params, default):
python26_re = r'^.*-(py(thon)?)?26.*$' python26_re = r'^.*-(py(thon)?)?26.*$'
centos6_re = r'^.*-centos6.*$' centos6_re = r'^.*-centos6.*$'
f20_re = r'^.*-f20.*$' f20_re = r'^.*-f20.*$'
python33_re = r'^.*-py(py|(thon)?33).*$' python33_re = r'^.*-(pypy|py(thon)?33|33).*$'
tripleo_re = r'^.*-tripleo.*$' tripleo_re = r'^.*-tripleo.*$'
devstack_re = r'^.*-dsvm.*$' devstack_re = r'^.*-dsvm.*$'
# jobs run on the proposal worker # jobs run on the proposal worker