Run npm upload job on relase slave

We need to be explicit that we want the npm upload job to run on the
release slave otherwise gearman will attempt to run it on the default
slave label which will fail because that job won't be registered.

To do this rename the job so that it matches existing convention which
makes the regex easier to read/write. Then update the reuseable slave
regex to include the job which will force it to run on release slave
without offlining the slave.

Change-Id: I26355680f2d8fc3fa5f514370d1586deb701c21c
This commit is contained in:
Clark Boylan 2015-10-07 15:56:50 -07:00
parent fcd02f1c61
commit 845b4d0718
3 changed files with 4 additions and 4 deletions

View File

@ -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'

View File

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

View File

@ -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.*$'