From c76f930c09b57ac134d8610ed5fde6d3b802806b Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 19 Jun 2014 11:15:56 -0700 Subject: [PATCH] Run all dsvm jobs from juno onwards on trusty We have trusty slaves, we have trusty workers registered in gearman, make zuul use them for everything newer than icehouse when running dsvm jobs. Change-Id: Iae037e6c1853aee5044c8e8549d8b6dc93db2b02 --- .../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):