Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[FIXED JENKINS-32823] Added "When no combinations to rerun"
- Loading branch information
Showing
11 changed files
with
244 additions
and
8 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
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
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
55 changes: 55 additions & 0 deletions
55
src/main/java/com/chikli/hudson/plugin/naginator/NoChildStrategy.java
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,55 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2016 IKEDA Yasuyuki | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
|
||
package com.chikli.hudson.plugin.naginator; | ||
|
||
import javax.annotation.Nonnull; | ||
|
||
import org.jvnet.localizer.Localizable; | ||
|
||
/** | ||
* The strategy for no children to rerun. | ||
* | ||
* @since 1.17 | ||
*/ | ||
public enum NoChildStrategy { | ||
RerunWhole(Messages._NoChildStrategy_RerunWhole_DisplayName()), | ||
RerunEmpty(Messages._NoChildStrategy_RerunEmpty_DisplayName()), | ||
DontRun(Messages._NoChildStrategy_DontRerun_DisplayName()), | ||
; | ||
private final Localizable displayName; | ||
|
||
private NoChildStrategy(Localizable displayName) { | ||
this.displayName = displayName; | ||
} | ||
|
||
public String getDisplayName() { | ||
return displayName.toString(); | ||
} | ||
|
||
@Nonnull | ||
public static NoChildStrategy getDefault() { | ||
return RerunWhole; | ||
} | ||
} |
4 changes: 3 additions & 1 deletion
4
src/main/resources/com/chikli/hudson/plugin/naginator/Messages.properties
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,2 +1,4 @@ | ||
NaginatorCause.Description=Started by Naginator after build {0} failure | ||
|
||
NoChildStrategy.RerunWhole.DisplayName=Rerun the matrix with all combinations | ||
NoChildStrategy.RerunEmpty.DisplayName=Rerun the matrix with no combinations | ||
NoChildStrategy.DontRerun.DisplayName=Don''t rerun |
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
12 changes: 12 additions & 0 deletions
12
...resources/com/chikli/hudson/plugin/naginator/NaginatorPublisher/help-noChildStrategy.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,12 @@ | ||
<div> | ||
How to rerun the build if no combinations to rerun. | ||
This configuration takes effect only when you check "Rerun build only for failed parts on the matrix". | ||
<dl> | ||
<dt>Rerun the matrix with all combinations</dt> | ||
<dd>Reruns whole the matrix. This is useful if you want always rerun something.</dd> | ||
<dt>Rerun the matrix with no combinations</dt> | ||
<dd>Reruns the matrix with no children. This is useful if you want rerun only aggregation processes. Some processes may fail if no children.</dd> | ||
<dt>Don't rerun</dt> | ||
<dd>Doesn't rerun the matrix. This is useful especially when used with the regular expressions.</dd> | ||
</dl> | ||
</div> |
5 changes: 5 additions & 0 deletions
5
...resources/com/chikli/hudson/plugin/naginator/NaginatorPublisher/help-rerunMatrixPart.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,5 @@ | ||
<div> | ||
Applicable only to multi-configuration projects. | ||
Reruns only failed axes combinations. | ||
If not checked, always reruns all the combinations. | ||
</div> |
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