openstack
/
project-config
Code Issues Proposed changes

Merge "Remove f20 node matching"

This commit is contained in:
Jenkins 2015-04-21 16:35:50 +00:00 committed by Gerrit Code Review
parent db5f78439a 951cf0cd99
commit 2de9955e05
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zuul/openstack_functions.py
View File

@ -92,7 +92,6 @@ def set_node_options(item, job, params, default):
pypi_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
python26_re = r'^.*-(py(thon)?)?26.*$'
centos6_re = r'^.*-centos6.*$'
f20_re = r'^.*-f20.*$'
f21_re = r'^.*-f21.*$'
tripleo_re = r'^.*-tripleo.*$'
devstack_re = r'^.*-dsvm.*$'
@ -108,10 +107,6 @@ def set_node_options(item, job, params, default):
elif re.match(centos6_re, job.name):
# Pass because job specified label is always correct.
pass
# Jobs needing fedora 20
elif re.match(f20_re, job.name):
# Pass because job specified label is always correct.
pass
# Jobs needing fedora 21
elif re.match(f21_re, job.name):
# Pass because job specified label is always correct.