openstack/project-config
Code Issues Proposed changes

Remove icehouse-dibtest special handling

Browse Source 
There are no jobs called icehouse-dibtest anymore, remove special
handling from openstack_functions.

Change-Id: Id8bf7929af54b3a122766aaf6b391766a9d983d7
This commit is contained in:
Andreas Jaeger 2015-12-12 11:13:04 +01:00
parent 2c90e47fa9
commit 4ebe6b19f4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/zuul/openstack_functions.py
View File

@ -43,9 +43,7 @@ def devstack_params(item, job, params):
# This is necessary to get the gearman plugin to register
# gearman jobs with both node labels.
# Remove this when we are done doing prelimindary dib testing.
if 'icehouse-dibtest' in job.name:
params['ZUUL_NODE'] = 'devstack-precise-dib'
elif 'dibtest' in job.name:
if 'dibtest' in job.name:
params['ZUUL_NODE'] = 'devstack-trusty-dib'
elif ((hasattr(change, 'branch') and
change.branch == 'stable/icehouse') or

4
zuul/openstack_functions.py
View File

@ -43,9 +43,7 @@ def devstack_params(item, job, params):
# This is necessary to get the gearman plugin to register
# gearman jobs with both node labels.
# Remove this when we are done doing prelimindary dib testing.
if 'icehouse-dibtest' in job.name:
params['ZUUL_NODE'] = 'devstack-precise-dib'
elif 'multinode' in job.name and 'dibtest' in job.name:
if 'multinode' in job.name and 'dibtest' in job.name:
params['ZUUL_NODE'] = 'ubuntu-trusty-2-node'
elif 'dibtest' in job.name:
params['ZUUL_NODE'] = 'ubuntu-trusty'