openstack/project-config
Code Issues Proposed changes

Let kolla-build-image jobs choose their own label

Browse Source 
Since we have zuul picking node labels to accomodate for possible branch
specific label needs we need to whitelist the kolla image build jobs as
they always have a single build_host:image_type mapping and branches
don't affect that.

Change-Id: I75e20a53c2091df1571eeff89cb6fd2e927e0a91
This commit is contained in:
Clark Boylan 2015-08-14 15:27:28 -07:00
parent e5cc578293
commit 3c601a7e5d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/openstack_functions.py
View File

@ -99,6 +99,7 @@ def set_node_options(item, job, params, default):
centos6_re = r'^.*-centos6.*$' centos6_re = r'^.*-centos6.*$'
f21_re = r'^.*-f21.*$' f21_re = r'^.*-f21.*$'
tripleo_re = r'^.*-tripleo.*$' tripleo_re = r'^.*-tripleo.*$'
kolla_image_re = r'^.*-kolla-build-images-.*$'
devstack_re = r'^.*-dsvm.*$' devstack_re = r'^.*-dsvm.*$'
puppetunit_re = ( puppetunit_re = (
r'^gate-(puppet-.*|system-config)-puppet-(lint|syntax|unit).*$') r'^gate-(puppet-.*|system-config)-puppet-(lint|syntax|unit).*$')
@ -110,6 +111,11 @@ def set_node_options(item, job, params, default):
elif re.match(python26_re, job.name): elif re.match(python26_re, job.name):
# Pass because job specified label is always correct. # Pass because job specified label is always correct.
pass pass
# Kolla build image jobs always have the correct node label.
# Put before distro specific overrides as they list distros in
# the jobs names unrelated to where job should run.
elif re.match(kolla_image_re, job.name):
pass
# Jobs needing centos6 # Jobs needing centos6
elif re.match(centos6_re, job.name): elif re.match(centos6_re, job.name):
# Pass because job specified label is always correct. # Pass because job specified label is always correct.