From 049ec0f67c53ee66ac3debfabf5acf84892b3bd9 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 22 Jul 2014 10:51:46 -0700 Subject: [PATCH] Run sqa-migrate py26 jobs on centos6 nodes. The sqlalchemy migrate special env job for python 26 name does not match the centos6 assiginment in the zuul openstack functions for node type. This causes the jobs to end up as not registered with gearman. Update the regex in the zuul functions to match gate-sqlalchemy-migrate-26fooblah. This will make the jobs register with gearman so that zuul can run them. Fixes-bug: 1347068 Change-Id: I5944889d53656395c98bab9a97cb4e76c793c9fd --- modules/openstack_project/files/zuul/openstack_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py index 4e16834bda..dd85926f85 100644 --- a/modules/openstack_project/files/zuul/openstack_functions.py +++ b/modules/openstack_project/files/zuul/openstack_functions.py @@ -87,7 +87,7 @@ def set_node_options(item, job, params, default): params['OFFLINE_NODE_WHEN_COMPLETE'] = '1' proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(requirements|translation)-updates?)$' # noqa pypi_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$' - python26_re = r'^.*-py(thon)?26.*$' + python26_re = r'^.*-(py(thon)?)?26.*$' centos6_re = r'^.*-centos6.*$' f20_re = r'^.*-f20.*$' python33_re = r'^.*-py(py|(thon)?33).*$'