From 72c32e161e126a7dfdda82f801ba4c18b2f76a9e Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 20 Jun 2014 11:02:50 -0700 Subject: [PATCH] Revert "Run all dsvm jobs from juno onwards on trusty" 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 --- .../files/zuul/openstack_functions.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py index 8be03152de..7e48872a7e 100644 --- a/modules/openstack_project/files/zuul/openstack_functions.py +++ b/modules/openstack_project/files/zuul/openstack_functions.py @@ -37,19 +37,7 @@ def reusable_node(item, job, params): def devstack_params(item, job, params): - 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' + params['ZUUL_NODE'] = 'devstack-precise' def default_params_precise(item, job, params):