opendev/system-config
Code Issues Proposed changes

Revert "Revert "Run all dsvm jobs from juno onwards on trusty""

Browse Source 
This reverts commit 72c32e161e126a7dfdda82f801ba4c18b2f76a9e.

Jenkins masters have all had their gearman plugin updating which makes
them register jobs properly.

Change-Id: I6894e590a2ee033ad46149c2859b8f8c33055c5a
This commit is contained in:
Clark Boylan 2014-06-23 17:06:52 -07:00
parent 2da6d623e0
commit 78d9d25251
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,19 @@ def reusable_node(item, job, params):
def devstack_params(item, job, params):
params['ZUUL_NODE'] = 'devstack-precise'
change = item.change
# Note we can't fallback on the default labels because
# jenkins uses 'devstack-precise || devstack-trusty'.
# This is necessary to get the gearman plugin to register
# gearman jobs with both node labels.
if ((hasattr(change, 'branch') and
change.branch == 'stable/havana' or
change.branch == 'stable/icehouse') or
('havana' in job.name or
'icehouse' in job.name)):
params['ZUUL_NODE'] = 'devstack-precise'
else:
params['ZUUL_NODE'] = 'devstack-trusty'
def default_params_precise(item, job, params):