Switch jobs from old pypi to new release worker

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

dev/zuul/openstack_functions.py

@@ -89,7 +89,7 @@ def set_node_options(item, job, params, default):
     # Select node to run job on.
     params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
     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.*$'
     centos6_re = r'^.*-centos6.*$'
     f20_re = r'^.*-f20.*$'
@@ -98,7 +98,7 @@ def set_node_options(item, job, params, default):
     devstack_re = r'^.*-dsvm.*$'
     puppetunit_re = r'^gate-puppet-.*-puppet-(lint|syntax|unit).*$'
     # 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)
     # Jobs needing python26
     elif re.match(python26_re, job.name):

jenkins/jobs/jenkins-plugin-jobs.yaml

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

jenkins/jobs/maven-plugin-jobs.yaml

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

jenkins/jobs/puppet-module-jobs.yaml

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

jenkins/jobs/pypi-jobs.yaml

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

zuul/openstack_functions.py

@@ -89,7 +89,7 @@ def set_node_options(item, job, params, default):
     # Select node to run job on.
     params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
     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.*$'
     centos6_re = r'^.*-centos6.*$'
     f21_re = r'^.*-f21.*$'
@@ -98,7 +98,7 @@ def set_node_options(item, job, params, default):
     puppetunit_re = (
         r'^gate-(puppet-.*|system-config)-puppet-(lint|syntax|unit).*$')
     # 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)
     # Jobs needing python26
     elif re.match(python26_re, job.name):