From 78d9d2525108ec87ec5a04fc1a275e366c560acf Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 23 Jun 2014 17:06:52 -0700 Subject: [PATCH] Revert "Revert "Run all dsvm jobs from juno onwards on trusty"" This reverts commit 72c32e161e126a7dfdda82f801ba4c18b2f76a9e. Jenkins masters have all had their gearman plugin updating which makes them register jobs properly. Change-Id: I6894e590a2ee033ad46149c2859b8f8c33055c5a --- .../files/zuul/openstack_functions.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py index 7e48872a7e..8be03152de 100644 --- a/modules/openstack_project/files/zuul/openstack_functions.py +++ b/modules/openstack_project/files/zuul/openstack_functions.py @@ -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):