From eb83de01218b8ebebd3f0b181d3adc4020458df1 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 22 Jul 2014 14:37:23 -0400 Subject: [PATCH] Run pecan py33-scaffolds jobs on py3k-precise nodes. Also, update the regex in the zuul functions to match `gate-pecan-tox-scaffolds-33`. This will make the jobs register with gearman so that zuul can run them. Change-Id: Ia7d2ff6fd39b7034061f46042e019217857bcbd4 --- .../files/jenkins_job_builder/config/projects.yaml | 2 +- modules/openstack_project/files/zuul/openstack_functions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 4ec86beebd..bdfc62221f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -2443,7 +2443,7 @@ envlist: scaffolds-27 - gate-{name}-tox-{envlist}: envlist: scaffolds-33 - node: bare-precise + node: py3k-precise - gate-{name}-tox-{envlist}: envlist: wsme-stable - gate-{name}-tox-{envlist}: diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py index 4e16834bda..2e1f3795f8 100644 --- a/modules/openstack_project/files/zuul/openstack_functions.py +++ b/modules/openstack_project/files/zuul/openstack_functions.py @@ -90,7 +90,7 @@ def set_node_options(item, job, params, default): python26_re = r'^.*-py(thon)?26.*$' centos6_re = r'^.*-centos6.*$' f20_re = r'^.*-f20.*$' - python33_re = r'^.*-py(py|(thon)?33).*$' + python33_re = r'^.*-(pypy|py(thon)?33|33).*$' tripleo_re = r'^.*-tripleo.*$' devstack_re = r'^.*-dsvm.*$' # jobs run on the proposal worker