jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Add trigger-with-no-params for join-trigger"

Browse Source
This commit is contained in:
Jenkins 2015-08-11 15:50:57 +00:00 committed by Gerrit Code Review
commit 347a231e07
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins_jobs/modules/publishers.py
View File

@ -269,6 +269,8 @@ def trigger_parameterized_builds(parser, xml_parent, data):
:arg str property-file: Use properties from file (optional) :arg str property-file: Use properties from file (optional)
:arg bool fail-on-missing: Blocks the triggering of the downstream jobs :arg bool fail-on-missing: Blocks the triggering of the downstream jobs
if any of the files are not found in the workspace (default 'False') if any of the files are not found in the workspace (default 'False')
:arg bool trigger-with-no-params: Trigger a build even when there are
currently no parameters defined (default 'False')
:arg str restrict-matrix-project: Filter that restricts the subset :arg str restrict-matrix-project: Filter that restricts the subset
of the combinations that the downstream project will run (optional) of the combinations that the downstream project will run (optional)
:arg str node-label-name: Specify the Name for the NodeLabel parameter. :arg str node-label-name: Specify the Name for the NodeLabel parameter.
@ -370,7 +372,8 @@ def trigger_parameterized_builds(parser, xml_parent, data):
condition.text = project_def.get('condition', 'ALWAYS') condition.text = project_def.get('condition', 'ALWAYS')
trigger_with_no_params = XML.SubElement(tconfig, trigger_with_no_params = XML.SubElement(tconfig,
'triggerWithNoParameters') 'triggerWithNoParameters')
trigger_with_no_params.text = 'false' trigger_with_no_params.text = str(
project_def.get('trigger-with-no-params', False)).lower()
def trigger(parser, xml_parent, data): def trigger(parser, xml_parent, data):

2
tests/publishers/fixtures/join-trigger001.xml
View File

@ -12,7 +12,7 @@
</configs> </configs>
<projects>archive</projects> <projects>archive</projects>
<condition>ALWAYS</condition> <condition>ALWAYS</condition>
<triggerWithNoParameters>false</triggerWithNoParameters> <triggerWithNoParameters>true</triggerWithNoParameters>
</hudson.plugins.parameterizedtrigger.BuildTriggerConfig> </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
<hudson.plugins.parameterizedtrigger.BuildTriggerConfig> <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
<configs> <configs>

2
tests/publishers/fixtures/join-trigger001.yaml
View File

@ -8,5 +8,7 @@ publishers:
- trigger-parameterized-builds: - trigger-parameterized-builds:
- project: archive - project: archive
current-parameters: true current-parameters: true
trigger-with-no-params: true
- project: cleanup - project: cleanup
current-parameters: true current-parameters: true
trigger-with-no-params: false