openstack/project-config
Code Issues Proposed changes

Switch jobs from old pypi to new release worker

Browse Source 
This is mainly cleanup to get rid of the old misleading slave label.
The old worker already has the new label applied, to make switching
more seamless.

Change-Id: Iefd6ed3fbb696b2009e8525c4cac1f0e1aca50e3
This commit is contained in:
Jeremy Stanley 2015-07-03 18:35:42 +00:00
parent 6fc7b1b771
commit 4af904b5d6
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/zuul/openstack_functions.py
View File

@ -89,7 +89,7 @@ def set_node_options(item, job, params, default):
# Select node to run job on. # Select node to run job on.
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
pypi_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$' release_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
python26_re = r'^.*-(py(thon)?)?26.*$' python26_re = r'^.*-(py(thon)?)?26.*$'
centos6_re = r'^.*-centos6.*$' centos6_re = r'^.*-centos6.*$'
f20_re = r'^.*-f20.*$' f20_re = r'^.*-f20.*$'
@ -98,7 +98,7 @@ def set_node_options(item, job, params, default):
devstack_re = r'^.*-dsvm.*$' devstack_re = r'^.*-dsvm.*$'
puppetunit_re = r'^gate-puppet-.*-puppet-(lint|syntax|unit).*$' puppetunit_re = r'^gate-puppet-.*-puppet-(lint|syntax|unit).*$'
# jobs run on the proposal worker # jobs run on the proposal worker
if re.match(proposal_re, job.name) or re.match(pypi_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 python26 # Jobs needing python26
elif re.match(python26_re, job.name): elif re.match(python26_re, job.name):

2
jenkins/jobs/jenkins-plugin-jobs.yaml
View File

@ -50,7 +50,7 @@
- job-template: - job-template:
name: '{name}-jenkinsci-upload' name: '{name}-jenkinsci-upload'
node: pypi node: release
builders: builders:
- revoke-sudo - revoke-sudo

2
jenkins/jobs/maven-plugin-jobs.yaml
View File

@ -28,7 +28,7 @@
- job-template: - job-template:
name: '{name}-mavencentral-upload' name: '{name}-mavencentral-upload'
node: pypi node: release
builders: builders:
- revoke-sudo - revoke-sudo

2
jenkins/jobs/puppet-module-jobs.yaml
View File

@ -109,7 +109,7 @@
- job-template: - job-template:
name: '{name}-forge-upload' name: '{name}-forge-upload'
node: pypi node: release
builders: builders:
- revoke-sudo - revoke-sudo

4
jenkins/jobs/pypi-jobs.yaml
View File

@ -1,6 +1,6 @@
- job-template: - job-template:
name: '{name}-pypi-both-upload' name: '{name}-pypi-both-upload'
node: pypi node: release
builders: builders:
- revoke-sudo - revoke-sudo
@ -19,7 +19,7 @@
- job-template: - job-template:
name: '{name}-pypi-wheel-upload' name: '{name}-pypi-wheel-upload'
node: pypi node: release
builders: builders:
- revoke-sudo - revoke-sudo

4
zuul/openstack_functions.py
View File

@ -89,7 +89,7 @@ def set_node_options(item, job, params, default):
# Select node to run job on. # Select node to run job on.
params['OFFLINE_NODE_WHEN_COMPLETE'] = '1' params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?))$' # noqa proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?))$' # noqa
pypi_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$' release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
python26_re = r'^.*-(py(thon)?)?26.*$' python26_re = r'^.*-(py(thon)?)?26.*$'
centos6_re = r'^.*-centos6.*$' centos6_re = r'^.*-centos6.*$'
f21_re = r'^.*-f21.*$' f21_re = r'^.*-f21.*$'
@ -98,7 +98,7 @@ def set_node_options(item, job, params, default):
puppetunit_re = ( puppetunit_re = (
r'^gate-(puppet-.*|system-config)-puppet-(lint|syntax|unit).*$') r'^gate-(puppet-.*|system-config)-puppet-(lint|syntax|unit).*$')
# jobs run on the proposal worker # jobs run on the proposal worker
if re.match(proposal_re, job.name) or re.match(pypi_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 python26 # Jobs needing python26
elif re.match(python26_re, job.name): elif re.match(python26_re, job.name):