Merge "Run npm upload job on relase slave"

jenkins/jobs/javascript.yaml

@@ -145,7 +145,7 @@
 
 # Uploads a release tarball to npm.
 - job-template:
-    name: '{name}-npm-publish'
+    name: '{name}-npm-upload'
     node: release
 
     builders:
@@ -167,4 +167,4 @@
     name: publish-to-npm
     jobs:
       - '{name}-npm-publish-tarball'
-      - '{name}-npm-publish'
+      - '{name}-npm-upload'

zuul/layout.yaml

@@ -600,7 +600,7 @@ project-templates:
   - name: publish-to-npm
     release:
       - '{name}-npm-publish-tarball':
-        - '{name}-npm-publish'
+        - '{name}-npm-upload'
 
 jobs:
   - name: ^.*$

zuul/openstack_functions.py

@@ -93,7 +93,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?|update-liberty))$'  # noqa
-    release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
+    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.*$'