openstack/project-config
Code Issues Proposed changes

Remove centos6 from openstack_functions

Browse Source 
With CentOS6 disabled, we can remove it here.

Change-Id: Ib42b39097497a44168d4f31445c586ba4daa1c45
This commit is contained in:
Andreas Jaeger
2015-12-04 21:51:38 +01:00
parent 552521848a
commit dc399e5a87
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev/zuul/openstack_functions.py
View File

@@ -90,7 +90,6 @@ def set_node_options(item, job, params, default):
params['OFFLINE_NODE_WHEN_COMPLETE'] = '1' params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-updates?)$' # noqa proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-updates?)$' # noqa
release_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$' release_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
centos6_re = r'^.*-centos6.*$'
f20_re = r'^.*-f20.*$' f20_re = r'^.*-f20.*$'
f21_re = r'^.*-f21.*$' f21_re = r'^.*-f21.*$'
tripleo_re = r'^.*-tripleo.*$' tripleo_re = r'^.*-tripleo.*$'
@@ -99,10 +98,6 @@ def set_node_options(item, job, params, default):
# jobs run on the proposal worker # jobs run on the proposal worker
if re.match(proposal_re, job.name) or re.match(release_re, job.name): if re.match(proposal_re, job.name) or re.match(release_re, job.name):
reusable_node(item, job, params) reusable_node(item, job, params)
# Jobs needing centos6
elif re.match(centos6_re, job.name):
# Pass because job specified label is always correct.
pass
# Jobs needing fedora 20 # Jobs needing fedora 20
elif re.match(f20_re, job.name): elif re.match(f20_re, job.name):
# Pass because job specified label is always correct. # Pass because job specified label is always correct.

5
zuul/openstack_functions.py
View File

@@ -95,7 +95,6 @@ def set_node_options(item, job, params, default):
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?|update-liberty))$' # noqa proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?|update-liberty))$' # noqa
release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$' release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$'
hook_re = r'^hook-(.*?)-(rtfd)$' hook_re = r'^hook-(.*?)-(rtfd)$'
centos6_re = r'^.*-centos6.*$'
fedora_re = r'^.*-f(edora-)?2(1|2|3).*$' fedora_re = r'^.*-f(edora-)?2(1|2|3).*$'
tripleo_re = r'^.*-tripleo-ci.*$' tripleo_re = r'^.*-tripleo-ci.*$'
kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-.*$' kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-.*$'
@@ -112,10 +111,6 @@ def set_node_options(item, job, params, default):
# the jobs names unrelated to where job should run. # the jobs names unrelated to where job should run.
elif re.match(kolla_image_re, job.name): elif re.match(kolla_image_re, job.name):
pass pass
# Jobs needing centos6
elif re.match(centos6_re, job.name):
# Pass because job specified label is always correct.
pass
# Jobs needing fedora 2[1|2|3] # Jobs needing fedora 2[1|2|3]
elif re.match(fedora_re, job.name): elif re.match(fedora_re, job.name):
# Pass because job specified label is always correct. # Pass because job specified label is always correct.