Update the parallel job example for Pipeline Model Definition Plugin …

…v1.2 parallel stages and added test support for that. Main Jenkinsfile now creates JUnit report.
macg33zr · Sep 28, 2017 · 5a1e301 · 5a1e301
1 parent 798761d
commit 5a1e301
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -87,7 +87,8 @@ pipeline {
 
     post {
         always {
-            echo 'pipeline unit tests completed'
+            echo 'pipeline unit tests completed - recording JUnit results'
+            junit 'build/reports/**/*.xml'
         }
 
         success {

diff --git a/exampleJobs/parallel/Jenkinsfile b/exampleJobs/parallel/Jenkinsfile
@@ -45,7 +45,8 @@ pipeline {
             }
         }
 
-        stage('Static') {
+        // Pre pipeline v1.2 do it this way, awkward syntax
+        stage('Static Old Way') {
             steps {
                 parallel (
                     'branch_1' : {
@@ -58,5 +59,33 @@ pipeline {
             }
         }
 
+        // From pipeline v1.2 do it this way : requires Pipeline Model Definition Plugin v1.2+
+        stage('Static New Way') {
+
+            // Support for full parallel stages. Nice.
+            parallel {
+
+                stage('Stage 1') {
+                    steps {
+                        echo "Running pipeline v1.2 static stage 1"
+                    }
+                }
+
+                stage('Stage 2') {
+                    steps {
+                        echo "Running pipeline v1.2 static stage 2"
+                    }
+                }
+
+                stage('Stage Skipped') {
+
+                    when { expression { false } }
+
+                    steps {
+                        echo "pipeline v1.2 static stage will be skipped"
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/pipelineTests/groovy/testSupport/PipelineTestHelper.groovy b/pipelineTests/groovy/testSupport/PipelineTestHelper.groovy
@@ -107,6 +107,8 @@ class PipelineTestHelper extends BasePipelineTest {
         helper.registerAllowedMethod('stages', [Closure.class], null)
         helper.registerAllowedMethod('validateDeclarativePipeline', [String.class], null)
 
+        helper.registerAllowedMethod('parallel', [Closure.class], null)
+
         /**
          * Handling of a stage skipping execution in tests due to failure, abort, when
          */

diff --git a/...ks/JenkinsfileTestSpec_Jenkinsfile_Should_Run_Gradle_validate_false_gradle_build test.txt b/...ks/JenkinsfileTestSpec_Jenkinsfile_Should_Run_Gradle_validate_false_gradle_build test.txt
@@ -28,7 +28,8 @@
                         Jenkinsfile.sh(gradle build test)
          Jenkinsfile.post(groovy.lang.Closure)
             Jenkinsfile.always(groovy.lang.Closure)
-               Jenkinsfile.echo(pipeline unit tests completed)
+               Jenkinsfile.echo(pipeline unit tests completed - recording JUnit results)
+               Jenkinsfile.junit(build/reports/**/*.xml)
             Jenkinsfile.success(groovy.lang.Closure)
                Jenkinsfile.echo(pipeline unit tests PASSED)
             Jenkinsfile.failure(groovy.lang.Closure)

diff --git a/...allstacks/JenkinsfileTestSpec_Jenkinsfile_Should_Run_Gradle_validate_null_gradle_null.txt b/...allstacks/JenkinsfileTestSpec_Jenkinsfile_Should_Run_Gradle_validate_null_gradle_null.txt
@@ -32,7 +32,8 @@
                         Jenkinsfile.sh(gradle clean build test -i)
          Jenkinsfile.post(groovy.lang.Closure)
             Jenkinsfile.always(groovy.lang.Closure)
-               Jenkinsfile.echo(pipeline unit tests completed)
+               Jenkinsfile.echo(pipeline unit tests completed - recording JUnit results)
+               Jenkinsfile.junit(build/reports/**/*.xml)
             Jenkinsfile.success(groovy.lang.Closure)
                Jenkinsfile.echo(pipeline unit tests PASSED)
             Jenkinsfile.failure(groovy.lang.Closure)

diff --git a/...allstacks/JenkinsfileTestSpec_Jenkinsfile_Should_Run_Gradle_validate_true_gradle_test.txt b/...allstacks/JenkinsfileTestSpec_Jenkinsfile_Should_Run_Gradle_validate_true_gradle_test.txt
@@ -32,7 +32,8 @@
                         Jenkinsfile.sh(gradle test)
          Jenkinsfile.post(groovy.lang.Closure)
             Jenkinsfile.always(groovy.lang.Closure)
-               Jenkinsfile.echo(pipeline unit tests completed)
+               Jenkinsfile.echo(pipeline unit tests completed - recording JUnit results)
+               Jenkinsfile.junit(build/reports/**/*.xml)
             Jenkinsfile.success(groovy.lang.Closure)
                Jenkinsfile.echo(pipeline unit tests PASSED)
             Jenkinsfile.failure(groovy.lang.Closure)

diff --git a/...ests/callstacks/ParallelJobTestSpec_Parallel_Jenkinsfile_should_complete_with_success.txt b/...ests/callstacks/ParallelJobTestSpec_Parallel_Jenkinsfile_should_complete_with_success.txt
@@ -0,0 +1,29 @@
+   Jenkinsfile.run()
+      Jenkinsfile.pipeline(groovy.lang.Closure)
+         Jenkinsfile.agent(groovy.lang.Closure)
+         Jenkinsfile.stages(groovy.lang.Closure)
+            Jenkinsfile.stage(Setup, groovy.lang.Closure)
+               Jenkinsfile.steps(groovy.lang.Closure)
+                  Jenkinsfile.script(groovy.lang.Closure)
+            Jenkinsfile.stage(Dynamic, groovy.lang.Closure)
+               Jenkinsfile.steps(groovy.lang.Closure)
+                  Jenkinsfile.script(groovy.lang.Closure)
+                     Jenkinsfile.parallel({foo=groovy.lang.Closure, bar=groovy.lang.Closure})
+                        Jenkinsfile.echo(Running foo branch..)
+                        Jenkinsfile.echo(Running bar branch...)
+            Jenkinsfile.stage(Static Old Way, groovy.lang.Closure)
+               Jenkinsfile.steps(groovy.lang.Closure)
+                  Jenkinsfile.parallel({branch_1=groovy.lang.Closure, branch_2=groovy.lang.Closure})
+                     Jenkinsfile.echo(Running static branch 1)
+                     Jenkinsfile.echo(Running static branch 2)
+            Jenkinsfile.stage(Static New Way, groovy.lang.Closure)
+               Jenkinsfile.parallel(groovy.lang.Closure)
+                  Jenkinsfile.stage(Stage 1, groovy.lang.Closure)
+                     Jenkinsfile.steps(groovy.lang.Closure)
+                        Jenkinsfile.echo(Running pipeline v1.2 static stage 1)
+                  Jenkinsfile.stage(Stage 2, groovy.lang.Closure)
+                     Jenkinsfile.steps(groovy.lang.Closure)
+                        Jenkinsfile.echo(Running pipeline v1.2 static stage 2)
+                  Jenkinsfile.stage(Stage Skipped, groovy.lang.Closure)
+                     Jenkinsfile.when(groovy.lang.Closure)
+                        Jenkinsfile.expression(groovy.lang.Closure)
diff --git a/pipelineTests/groovy/tests/job/exampleJobs/parallel/ParallelJobTestSpec.groovy b/pipelineTests/groovy/tests/job/exampleJobs/parallel/ParallelJobTestSpec.groovy
@@ -13,5 +13,8 @@ class ParallelJobTestSpec extends PipelineSpockTestBase {
         then:
         printCallStack()
         assertJobStatusSuccess()
+
+        then:
+        testNonRegression("Parallel_Jenkinsfile_should_complete_with_success")
     }
 }