Setup propose-puppet-openstack-constraints properly

Do not offline the proposal slave after
propose-puppet-openstack-constraints is run: Enhance proposal regex for
this.

Change-Id: I1b1408fe8a5de46e9df2611d11158562d4723713
This commit is contained in:
Andreas Jaeger 2016-05-06 10:26:24 +02:00
parent c5b3a82817
commit 9ba7542704

View File

@ -47,7 +47,7 @@ def set_node_options(item, job, params):
params['OFFLINE_NODE_WHEN_COMPLETE'] = '1' params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
# Pass tags through for subunit2sql # Pass tags through for subunit2sql
params['JOB_TAGS'] = ' '.join(sorted(job.tags)) params['JOB_TAGS'] = ' '.join(sorted(job.tags))
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?|update-(liberty|mitaka)|plugins-list))$' # noqa proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?|update-(liberty|mitaka)|plugins-list|openstack-constraints))$' # noqa
release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$' release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$'
hook_re = r'^hook-(.*?)-(rtfd)$' hook_re = r'^hook-(.*?)-(rtfd)$'
wheel_re = r'^wheel-(build|release)-.*$' wheel_re = r'^wheel-(build|release)-.*$'