Merge pull request #6373 from corda/merge-44-45

NOTICK: merging OS 4.4 with OS 4.5

.ci/dev/integration/Jenkinsfile

@@ -53,7 +53,7 @@ pipeline {
 
     post {
         always {
-            junit '**/build/test-results-xml/**/*.xml'
+            junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
         }
         cleanup {
             deleteDir() /* clean up our workspace */

.ci/dev/mswin/Jenkinsfile

@@ -0,0 +1,93 @@
+#!groovy
+/**
+ * Jenkins pipeline to build Corda on MS Windows server.
+ * Because it takes a long time to run tests sequentially, unit tests and
+ * integration tests are started in parallel on separate agents.
+ *
+ * Additionally, pull requests by default run only unit tests.
+ */
+
+/**
+ * Kill already started job.
+ * Assume new commit takes precendence and results from previous
+ * unfinished builds are not required.
+ * This feature doesn't play well with disableConcurrentBuilds() option
+ */
+@Library('corda-shared-build-pipeline-steps')
+import static com.r3.build.BuildControl.killAllExistingBuildsForJob
+killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
+
+/**
+ * Sense environment
+ */
+boolean isReleaseBranch = (env.BRANCH_NAME =~ /^release\/os\/.*/)
+
+pipeline {
+    agent none
+    options {
+        ansiColor('xterm')
+        timestamps()
+        timeout(time: 3, unit: 'HOURS')
+    }
+
+    parameters {
+        booleanParam defaultValue: (isReleaseBranch), description: 'Run integration tests?', name: 'DO_INTEGRATION_TESTS'
+    }
+
+    /*
+     * Do no receive Github's push events for release branches -> suitable for nightly builds
+     * but projects for pull requests will receive them as normal, and PR builds are started ASAP
+     */
+    triggers {
+        pollSCM ignorePostCommitHooks: isReleaseBranch, scmpoll_spec: '@midnight'
+    }
+
+    stages {
+        stage('Tests') {
+            parallel {
+                stage('Unit Tests') {
+                    agent { label 'mswin' }
+                    steps {
+                        sh "./gradlew --no-daemon " +
+                                "--stacktrace " +
+                                "-Pcompilation.warningsAsErrors=false " +
+                                "-Ptests.failFast=true " +
+                                "clean test"
+                    }
+                    post {
+                        always {
+                            archiveArtifacts allowEmptyArchive: true, artifacts: '**/logs/**/*.log'
+                            junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true, allowEmptyResults: true
+                            bat '.ci/kill_corda_procs.cmd'
+                        }
+                        cleanup {
+                            deleteDir() /* clean up our workspace */
+                        }
+                    }
+
+                }
+                stage('Integration Tests') {
+                    when {
+                        expression { params.DO_INTEGRATION_TESTS }
+                        beforeAgent true
+                    }
+                    agent { label 'mswin' }
+                    steps {
+                        sh "./gradlew --no-daemon " +
+                                "clean integrationTest"
+                    }
+                    post {
+                        always {
+                            archiveArtifacts allowEmptyArchive: true, artifacts: '**/logs/**/*.log'
+                            junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true, allowEmptyResults: true
+                            bat '.ci/kill_corda_procs.cmd'
+                        }
+                        cleanup {
+                            deleteDir() /* clean up our workspace */
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

.ci/dev/nightly-regression/Jenkinsfile

@@ -79,7 +79,7 @@ pipeline {
     post {
         always {
             archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
-            junit testResults: '**/build/test-results-xml/**/*.xml', allowEmptyResults: true
+            junit testResults: '**/build/test-results-xml/**/*.xml', allowEmptyResults: true, keepLongStdio: true
         }
         cleanup {
             deleteDir() /* clean up our workspace */

.ci/dev/regression/Jenkinsfile

@@ -1,8 +1,24 @@
+#!groovy
+/**
+ * Jenkins pipeline to build Corda OS release branches and tags
+ */
+
+/**
+ * Kill already started job.
+ * Assume new commit takes precendence and results from previous
+ * unfinished builds are not required.
+ * This feature doesn't play well with disableConcurrentBuilds() option
+ */
 @Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
 
+/**
+ * Sense environment
+ */
+boolean isTag = (env.TAG_NAME =~ /^release-V(\d+\.\d+)?(\.\d+)?(-.+)?$/)
+
 pipeline {
     agent { label 'k8s' }
     options {
@@ -19,6 +35,12 @@ pipeline {
     }
 
     stages {
+        stage('Deploy Nodes') {
+            steps {
+                sh "./gradlew --no-daemon jar deployNodes"
+            }
+        }
+
         stage('Generate Build Image') {
             steps {
                 withCredentials([string(credentialsId: 'container_reg_passwd', variable: 'DOCKER_PUSH_PWD')]) {
@@ -27,7 +49,7 @@ pipeline {
                             "-Ddocker.push.password=\"\${DOCKER_PUSH_PWD}\" " +
                             "-Ddocker.work.dir=\"/tmp/\${EXECUTOR_NUMBER}\" " +
                             "-Ddocker.build.tag=\"\${DOCKER_TAG_TO_USE}\"" +
-                            " clean preAllocateForParallelRegressionTest preAllocateForAllSlowIntegrationTest pushBuildImage --stacktrace"
+                            " clean preAllocateForParallelRegressionTest preAllocateForAllParallelSlowIntegrationTest pushBuildImage --stacktrace"
                 }
                 sh "kubectl auth can-i get pods"
             }
@@ -69,7 +91,7 @@ pipeline {
     post {
         always {
             archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
-            junit '**/build/test-results-xml/**/*.xml'
+            junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
 
             script {
                 try {
@@ -104,6 +126,7 @@ pipeline {
 
             script
             {
+                if (!isTag) {
                     // We want to send a summary email, but want to limit to once per day.
                     // Comparing the dates of the previous and current builds achieves this,
                     // i.e. we will only send an email for the first build on a given day.
@@ -136,6 +159,7 @@ pipeline {
                     }
                 }
             }
+        }
         cleanup {
             deleteDir() /* clean up our workspace */
         }

.ci/dev/smoke/Jenkinsfile

@@ -52,7 +52,7 @@ pipeline {
             script {
                 if (currentBuildTriggeredByComment()) {
                     archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
-                    junit '**/build/test-results-xml/**/*.xml'
+                    junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
                 }
             }
         }

.ci/dev/unit/Jenkinsfile

@@ -51,7 +51,7 @@ pipeline {
 
     post {
         always {
-            junit '**/build/test-results-xml/**/*.xml'
+            junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
         }
         cleanup {
             deleteDir() /* clean up our workspace */

Jenkinsfile

@@ -72,7 +72,7 @@ pipeline {
     post {
         always {
             archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
-            junit '**/build/test-results-xml/**/*.xml'
+            junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
         }
         cleanup {
             deleteDir() /* clean up our workspace */