openstack/project-config
Code Issues Proposed changes

Move hook-{name}-rtfd to proposal node

Browse Source 
Our RTFD hook just does a curl request to upstream. As such, it is
very expensive to nodepool to build a node for the purpose of just
using curl.

Lets move the job to use the proposal node which is long living.

Change-Id: I8f407fdaeb890a4ae6a9b99caefe836b8f2f7819
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2015-07-28 12:28:50 -04:00
parent 702c6e9db5
commit 7fa4911835
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/jobs/hooks.yaml
View File

@@ -1,6 +1,6 @@
- job-template: - job-template:
name: 'hook-{name}-rtfd' name: 'hook-{name}-rtfd'
node: 'bare-precise || bare-trusty' node: 'proposal'
builders: builders:
- revoke-sudo - revoke-sudo

4
zuul/openstack_functions.py
View File

@@ -94,6 +94,7 @@ def set_node_options(item, job, params, default):
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
release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$' release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
hook_re = r'^hook-(.*?)-(rtfd)$'
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.*$'
@@ -102,7 +103,8 @@ 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(release_re, job.name): 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) 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):