Define stages an go back to 2 forks as 3 is not more efficient

Author: Vlatombe

Jenkinsfile

@@ -5,48 +5,53 @@ properties([
 ])
 
 def splits
-node('linux') {
-    checkout scm
-    splits = splitTests parallelism: count(3), generateInclusions: true, estimateTestsFromFiles: true
+stage('Determine splits') {
+    node('linux') {
+        checkout scm
+        splits = splitTests parallelism: count(2), generateInclusions: true, estimateTestsFromFiles: true
+    }
 }
-def branches = [:]
-branches['failFast'] = true
+stage('Tests') {
+    def branches = [:]
+    branches['failFast'] = true
 
-for (int i = 0; i < splits.size(); i++) {
-    def num = i
-    def split = splits[num]
-    def index = num + 1
-    branches["kind-${index}"] = {
-        node('docker') {
-            timeout(90) {
-                checkout scm
-                try {
-                    writeFile file: (split.includes ? "$WORKSPACE_TMP/includes.txt" : "$WORKSPACE_TMP/excludes.txt"), text: split.list.join("\n")
-                    writeFile file: (split.includes ? "$WORKSPACE_TMP/excludes.txt" : "$WORKSPACE_TMP/includes.txt"), text: ''
-                    sh './kind.sh -Dsurefire.includesFile="$WORKSPACE_TMP/includes.txt" -Dsurefire.excludesFile="$WORKSPACE_TMP/excludes.txt"'
-                    dir (env.WORKSPACE_TMP) {
-                        junit 'surefire-reports/*.xml'
-                    }
-                } finally {
-                    dir (env.WORKSPACE_TMP) {
-                        if (fileExists('kindlogs/docker-info.txt')) {
-                            archiveArtifacts 'kindlogs/'
+    for (int i = 0; i < splits.size(); i++) {
+        def num = i
+        def split = splits[num]
+        def index = num + 1
+        branches["kind-${index}"] = {
+            node('docker') {
+                timeout(90) {
+                    checkout scm
+                    try {
+                        writeFile file: (split.includes ? "$WORKSPACE_TMP/includes.txt" : "$WORKSPACE_TMP/excludes.txt"), text: split.list.join("\n")
+                        writeFile file: (split.includes ? "$WORKSPACE_TMP/excludes.txt" : "$WORKSPACE_TMP/includes.txt"), text: ''
+                        sh './kind.sh -Dsurefire.includesFile="$WORKSPACE_TMP/includes.txt" -Dsurefire.excludesFile="$WORKSPACE_TMP/excludes.txt"'
+                        dir(env.WORKSPACE_TMP) {
+                            junit 'surefire-reports/*.xml'
+                        }
+                    } finally {
+                        dir(env.WORKSPACE_TMP) {
+                            if (fileExists('kindlogs/docker-info.txt')) {
+                                archiveArtifacts 'kindlogs/'
+                            }
                         }
                     }
                 }
             }
         }
     }
-}
-branches['jdk11'] = {
-    node('maven-11') {
-        timeout(60) {
-            checkout scm
-            sh 'mvn -B -ntp -Dset.changelist -Dmaven.test.failure.ignore clean install'
-            infra.prepareToPublishIncrementals()
-            junit 'target/surefire-reports/*.xml'
+    branches['jdk11'] = {
+        node('maven-11') {
+            timeout(60) {
+                checkout scm
+                sh 'mvn -B -ntp -Dset.changelist -Dmaven.test.failure.ignore clean install'
+                infra.prepareToPublishIncrementals()
+                junit 'target/surefire-reports/*.xml'
+            }
         }
     }
+    parallel branches
 }
-parallel branches
+// Stage part of the library
 infra.maybePublishIncrementals()