configs,
KillPhaseOnJobResultCondition killPhaseOnJobResultCondition,
- boolean disableJob, boolean enableRetryStrategy,
+ boolean disableJob, boolean pretendSuccess, boolean enableRetryStrategy,
String parsingRulesPath, int maxRetries, boolean enableCondition,
boolean abortAllJob, String condition, boolean buildOnlyIfSCMChanges,
boolean applyConditionOnlyIfNoSCMChanges, boolean aggregatedTestResults) {
@@ -215,6 +224,7 @@ public PhaseJobsConfig(String jobName, String jobProperties,
this.currParams = currParams;
this.killPhaseOnJobResultCondition = killPhaseOnJobResultCondition;
this.disableJob = disableJob;
+ this.pretendSuccess = pretendSuccess;
this.configs = Util.fixNull(configs);
this.enableRetryStrategy = enableRetryStrategy;
this.maxRetries = maxRetries;
diff --git a/src/main/resources/com/tikal/jenkins/plugins/multijob/MultiJobBuilder/config.jelly b/src/main/resources/com/tikal/jenkins/plugins/multijob/MultiJobBuilder/config.jelly
index 8432b365..1d408933 100644
--- a/src/main/resources/com/tikal/jenkins/plugins/multijob/MultiJobBuilder/config.jelly
+++ b/src/main/resources/com/tikal/jenkins/plugins/multijob/MultiJobBuilder/config.jelly
@@ -24,6 +24,9 @@
+
+
+
diff --git a/src/main/webapp/help-pretendSuccess.html b/src/main/webapp/help-pretendSuccess.html
new file mode 100644
index 00000000..8877884e
--- /dev/null
+++ b/src/main/webapp/help-pretendSuccess.html
@@ -0,0 +1,4 @@
+
+ Ignore the result of this job and pretend that sucess was returned.
+ Great for adding out a new phase job in production without having it break functionality
+
\ No newline at end of file
diff --git a/src/test/java/com/tikal/jenkins/plugins/multijob/test/ConditionalPhaseTest.java b/src/test/java/com/tikal/jenkins/plugins/multijob/test/ConditionalPhaseTest.java
index 940f1d4e..67589ee8 100644
--- a/src/test/java/com/tikal/jenkins/plugins/multijob/test/ConditionalPhaseTest.java
+++ b/src/test/java/com/tikal/jenkins/plugins/multijob/test/ConditionalPhaseTest.java
@@ -54,14 +54,14 @@ public void run(JenkinsRule j) throws Throwable {
final MultiJobProject multi = j.jenkins.createProject(MultiJobProject.class, "MultiTop");
// create 'FirstPhase' containing job 'free'
- PhaseJobsConfig firstPhase = new PhaseJobsConfig("free", null, true, null, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig firstPhase = new PhaseJobsConfig("free", null, true, null, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List configTopList = new ArrayList();
configTopList.add(firstPhase);
MultiJobBuilder firstPhaseBuilder = new MultiJobBuilder("FirstPhase", configTopList, ContinuationCondition.SUCCESSFUL, MultiJobBuilder.ExecutionType.PARALLEL);
// create 'SecondPhase' containing job 'free2'
- PhaseJobsConfig secondPhase = new PhaseJobsConfig("free2", null, true, null, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig secondPhase = new PhaseJobsConfig("free2", null, true, null, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List configTopList2 = new ArrayList();
configTopList.add(secondPhase);
MultiJobBuilder secondPhaseBuilder = new MultiJobBuilder("SecondPhase", configTopList2, ContinuationCondition.SUCCESSFUL, MultiJobBuilder.ExecutionType.PARALLEL);
diff --git a/src/test/java/com/tikal/jenkins/plugins/multijob/test/PhaseJobsConfigTest.java b/src/test/java/com/tikal/jenkins/plugins/multijob/test/PhaseJobsConfigTest.java
index 8ed48638..ee298713 100644
--- a/src/test/java/com/tikal/jenkins/plugins/multijob/test/PhaseJobsConfigTest.java
+++ b/src/test/java/com/tikal/jenkins/plugins/multijob/test/PhaseJobsConfigTest.java
@@ -81,7 +81,7 @@ public void testNoParameters() throws Exception {
AbstractProject projectB = createTriggeredProject(null);
MultiJobBuild mjb =createTriggeringBuild(null);
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "" , true, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "" , true, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, true);
// check single ParametersAction created
@@ -93,7 +93,7 @@ public void testDefaultParameters() throws Exception {
AbstractProject projectB = createTriggeredProject(DEFAULT_KEY_VALUES);
MultiJobBuild mjb = createTriggeringBuild(null);
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, true);
// check single ParametersAction created
@@ -113,7 +113,7 @@ public void testCurrentDefaultParameters() throws Exception {
AbstractProject projectB = createTriggeredProject(DEFAULT_KEY_VALUES);
MultiJobBuild mjb = createTriggeringBuild(createParametersAction(CURRENT_KEY_VALUES));
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "" , false, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "" , false, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, true);
@@ -136,7 +136,7 @@ public void testCurrentOverridesDefaultParameters() throws Exception {
AbstractProject projectB = createTriggeredProject(DEFAULT_KEY_VALUES);
MultiJobBuild mjb = createTriggeringBuild(createParametersAction(OVERRIDES_KEY_VALUES));
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, true);
@@ -158,7 +158,7 @@ public void testCurrentIgnoredDefaultParameters() throws Exception {
AbstractProject projectB = createTriggeredProject(DEFAULT_KEY_VALUES);
MultiJobBuild mjb = createTriggeringBuild(createParametersAction(OVERRIDES_KEY_VALUES));
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, null, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, false);
// check single ParametersAction created
@@ -181,7 +181,7 @@ public void testConfigsDefaultParameters() throws Exception {
configs.add(new TestParametersConfig());
configs.add(new TestParametersConfig(OVERRIDES_KEY_VALUES));
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, configs, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, configs, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, true);
@@ -210,7 +210,7 @@ public void testCurrentConfigsDefaultParameters() throws Exception {
configs.add(new TestParametersConfig());
configs.add(new TestParametersConfig(CONFIG_OVERRIDES_KEY_VALUES));
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, configs, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, configs, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, true);
@@ -239,7 +239,7 @@ public void testNotCurrentConfigsDefaultParameters() throws Exception {
configs.add(new TestParametersConfig());
configs.add(new TestParametersConfig(CONFIG_OVERRIDES_KEY_VALUES));
- PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, configs, KillPhaseOnJobResultCondition.NEVER, false, false, "", 0, false, false, "",false, false);
+ PhaseJobsConfig pjc = new PhaseJobsConfig("dummy", "", true, configs, KillPhaseOnJobResultCondition.NEVER, false, false, false, "", 0, false, false, "",false, false);
List actions = pjc.getActions(mjb, TaskListener.NULL, projectB, false);