added support for FAILURE and ALWAYS continuation conditions for the MultiJob plugin, JENKINS-26744

Author: daspilker

docs/Home.md

@@ -27,8 +27,10 @@ Have a look at the [Jenkins Job DSL Gradle example](https://github.com/sheehan/j
  * Added support for [PostBuildScript Plugin](https://wiki.jenkins-ci.org/display/JENKINS/PostBuildScript+Plugin)
  * Added support for [Xvfb Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Xvfb+Plugin)
  * Enhanced support for the [Credentials Binding Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Credentials+Binding+Plugin)
+ * Enhanced support for the [Multijob Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Multijob+Plugin)
  * The enum argument of `localRepository` for the Maven job and context has changed, see [[Migration]]
  * Added partial support for [Plot Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Plot+Plugin)
+ * Support for the older versions of the [Multijob Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Multijob+Plugin) is deprecated, see [[Migration]]
 * 1.30 (March 08 2015)
  * Added support for [Custom Tools Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Custom+Tools+Plugin)
  * Added support for [Flaky Test Handler Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Flaky+Test+Handler+Plugin)

docs/Migration.md

@@ -1,5 +1,9 @@
 ## Migrating to 1.31
 
+### MultiJob Plugin
+
+Support for version 1.15 and earlier of the MultiJob Plugin is [[deprecated|Deprecation-Policy]] and will be removed.
+
 ### Local Maven Repository Location
 
 The `localRepository` method with a `javaposse.jobdsl.dsl.helpers.common.MavenContext.LocalRepositoryLocation` argument

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/step/StepContext.groovy

@@ -623,14 +623,22 @@ class StepContext implements Context {
         PhaseContext phaseContext = new PhaseContext(jobManagement, name, continuationConditionArg)
         ContextHelper.executeInContext(phaseClosure, phaseContext)
 
+        VersionNumber multiJobPluginVersion = jobManagement.getPluginVersion('jenkins-multijob-plugin')
+
+        Set<String> validContinuationConditions = new HashSet<String>(VALID_CONTINUATION_CONDITIONS)
+        if (multiJobPluginVersion?.isNewerThan(new VersionNumber('1.10'))) {
+            validContinuationConditions << 'FAILURE'
+        }
+        if (multiJobPluginVersion?.isNewerThan(new VersionNumber('1.15'))) {
+            validContinuationConditions << 'ALWAYS'
+        }
+
         Preconditions.checkArgument(phaseContext.phaseName as Boolean, 'A phase needs a name')
         Preconditions.checkArgument(
-                VALID_CONTINUATION_CONDITIONS.contains(phaseContext.continuationCondition),
-                "Continuation Condition needs to be one of these values: ${VALID_CONTINUATION_CONDITIONS.join(', ')}"
+                validContinuationConditions.contains(phaseContext.continuationCondition),
+                "Continuation Condition needs to be one of these values: ${validContinuationConditions.join(', ')}"
         )
 
-        VersionNumber multiJobPluginVersion = jobManagement.getPluginVersion('jenkins-multijob-plugin')
-
         stepNodes << new NodeBuilder().'com.tikal.jenkins.plugins.multijob.MultiJobBuilder' {
             phaseName phaseContext.phaseName
             continuationCondition phaseContext.continuationCondition

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/step/StepContextSpec.groovy

@@ -1080,6 +1080,45 @@ class StepContextSpec extends Specification {
         thrown(IllegalArgumentException)
     }
 
+    def 'call phase with unsupported condition'(String condition, String version) {
+        setup:
+        jobManagement.getPluginVersion('jenkins-multijob-plugin') >> new VersionNumber(version)
+
+        when:
+        context.phase('test', condition) {
+        }
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        condition | version
+        'FAILURE' | '1.10'
+        'ALWAYS'  | '1.15'
+    }
+
+    def 'call phase with supported condition'(String condition, String version) {
+        setup:
+        jobManagement.getPluginVersion('jenkins-multijob-plugin') >> new VersionNumber(version)
+
+        when:
+        context.phase('test', condition) {
+        }
+
+        then:
+        with(context.stepNodes[0]) {
+            name() == 'com.tikal.jenkins.plugins.multijob.MultiJobBuilder'
+            children().size() == 3
+            phaseName[0].value() == 'test'
+            continuationCondition[0].value() == condition
+        }
+
+        where:
+        condition | version
+        'FAILURE' | '1.11'
+        'ALWAYS'  | '1.16'
+    }
+
     def 'call sbt method minimal'() {
         when:
         context.sbt('SBT 0.12.3')