Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'JENKINS-15834' of git://github.com/cjo9900/parameterize…
…d-trigger-plugin into 2.17-RC
- Loading branch information
Showing
6 changed files
with
112 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 10 additions & 7 deletions
17
src/main/resources/hudson/plugins/parameterizedtrigger/FileBuildParameters/config.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> | ||
|
||
<f:entry field="propertiesFile" title="Use properties from file"> | ||
<f:textbox /> | ||
</f:entry> | ||
|
||
</j:jelly> | ||
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> | ||
|
||
<f:entry field="propertiesFile" title="${%Use properties from file}"> | ||
<f:textbox /> | ||
</f:entry> | ||
<f:entry field="failTriggerOnMissing" title="${%Don't trigger if any files are missing}"> | ||
<f:checkbox default="false" /> | ||
</f:entry> | ||
|
||
</j:jelly> |
4 changes: 4 additions & 0 deletions
4
...es/hudson/plugins/parameterizedtrigger/FileBuildParameters/help-failTriggerOnMissing.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<div> | ||
When enabled blocks the triggering of the downstream jobs if | ||
any of the files are not found in the workspace. | ||
</div> |
2 changes: 1 addition & 1 deletion
2
...esources/hudson/plugins/parameterizedtrigger/FileBuildParameters/help-propertiesFile.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+560 Bytes
src/test/resources/hudson/plugins/parameterizedtrigger/test/multiple_property_files.zip
Binary file not shown.