opendev/system-config
Code Issues Proposed changes

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

Browse Source 
This reverts commit c76f930c09b57ac134d8610ed5fde6d3b802806b.

This is necessary as there is a Jenkings gearman-plugin bug that causes
a node to register all available labels for a job even if it is capable
of serving only one label. This bug prevents zuul from properly
selectiong nodes as desired by this change.

Change-Id: I035d31a91c4ca1a8366316b7ff422f4a2b03622c
This commit is contained in:
Clark Boylan 2014-06-20 11:02:50 -07:00
parent bf78092897
commit 72c32e161e
1 changed files with 1 additions and 13 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,19 +37,7 @@ def reusable_node(item, job, params):
def devstack_params(item, job, params): def devstack_params(item, job, params):
change = item.change params['ZUUL_NODE'] = 'devstack-precise'
# 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): def default_params_precise(item, job, params):