openstack/project-config
Code Issues Proposed changes

Merge "Remove the last little 2.6 bits"

Browse Source
This commit is contained in:
Jenkins 2015-12-04 20:48:52 +00:00 committed by Gerrit Code Review
commit 552521848a
3 changed files with 0 additions and 15 deletions
Show Stats 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'
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-updates?)$' # noqa
release_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
python26_re = r'^.*-(py(thon)?)?26.*$'
centos6_re = r'^.*-centos6.*$'
f20_re = r'^.*-f20.*$'
f21_re = r'^.*-f21.*$'
@ -100,10 +99,6 @@ def set_node_options(item, job, params, default):
# jobs run on the proposal worker
if re.match(proposal_re, job.name) or re.match(release_re, job.name):
reusable_node(item, job, params)
# Jobs needing python26
elif re.match(python26_re, job.name):
# Pass because job specified label is always correct.
pass
# Jobs needing centos6
elif re.match(centos6_re, job.name):
# Pass because job specified label is always correct.

5
jenkins/jobs/macros.yaml
View File

@ -476,11 +476,6 @@
builders:
- shell: "/usr/local/jenkins/slave_scripts/run-jsbuild.sh {command}"
- builder:
name: python26
builders:
- shell: "/usr/local/jenkins/slave_scripts/run-tox.sh py26"
- builder:
name: python27
builders:

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
release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$'
hook_re = r'^hook-(.*?)-(rtfd)$'
python26_re = r'^.*-(py(thon)?)?26.*$'
centos6_re = r'^.*-centos6.*$'
fedora_re = r'^.*-f(edora-)?2(1|2|3).*$'
tripleo_re = r'^.*-tripleo-ci.*$'
@ -108,10 +107,6 @@ def set_node_options(item, job, params, default):
if (re.match(proposal_re, job.name) or re.match(release_re, job.name) or
re.match(hook_re, job.name)):
reusable_node(item, job, params)
# Jobs needing python26
elif re.match(python26_re, job.name):
# Pass because job specified label is always correct.
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.