Merge pull request corda#5889 from corda/ramzi/43-44-merge

OS 4.3 -> OS 4.4 Merge
shaoyangdd · Jan 27, 2020 · fa55b66 · fa55b66
2 parents 7f62046 + ac8a4fc
commit fa55b66
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 24 deletions.
diff --git a/.ci/dev/integration/Jenkinsfile b/.ci/dev/integration/Jenkinsfile
@@ -1,5 +1,5 @@
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
-@Library('existing-build-control')
+@Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())

diff --git a/.ci/dev/nightly-regression/Jenkinsfile b/.ci/dev/nightly-regression/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('existing-build-control')
+@Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())

diff --git a/.ci/dev/on-demand-tests/Jenkinsfile b/.ci/dev/on-demand-tests/Jenkinsfile
@@ -0,0 +1,6 @@
+@Library('corda-shared-build-pipeline-steps') _
+import static com.r3.build.BuildControl.killAllExistingBuildsForJob
+
+killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
+
+onDemandTestPipeline('k8s', '.ci/dev/on-demand-tests/commentMappings.yml')
diff --git a/.ci/dev/on-demand-tests/commentMappings.yml b/.ci/dev/on-demand-tests/commentMappings.yml
@@ -0,0 +1,4 @@
+integration: { allParallelIntegrationTest }
+pr-merge: { parallelRegressionTest }
+smoke: { allParallelSmokeTest }
+unit: { allParallelUnitTest }
diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('existing-build-control')
+@Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
@@ -65,22 +65,13 @@ pipeline {
                      * copied to avoid collisions between files where the same test
                      * classes have run on multiple pods.
                      */
-                    sh label: 'Compact test results',
-                       script:
-                           '''#!/bin/bash
-                              shopt -s globstar
-                              rm -rf allure-input
-                              mkdir allure-input
-
-                              for i in **/test-results-xml/**/test-runs/test-reports/**
-                              do
-                                  [ -f $i ] &&
-                                  cp $i allure-input/$(echo $i | sed -e \\
-                                      \'s/.*test-results-xml\\/.*-\\(.*\\)\\/test-runs\\/.*\\/\\(.*\\)$/\\1\\-\\2/\')
-                              done
-
-                              echo "Finished compacting JUnit results"
-                       '''
+                    fileOperations([fileCopyOperation(
+                            includes: '**/test-results-xml/**/test-runs/test-reports/**',
+                            targetLocation: 'allure-input',
+                            flattenFiles: true,
+                            renameFiles: true,
+                            sourceCaptureExpression: '.*test-results-xml/.*-([\\d]+)/.*/([^/]+)$',
+                            targetNameExpression: '$1-$2')])
                     allure includeProperties: false,
                            jdk: '',
                            results: [[path: '**/allure-input']]
@@ -92,6 +83,40 @@ pipeline {
                     }
                 }
             }
+
+            script
+            {
+                // 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.
+                def prevBuildDate = new Date(
+                        currentBuild?.previousBuild.timeInMillis ?: 0).clearTime()
+                def currentBuildDate = new Date(
+                        currentBuild.timeInMillis).clearTime()
+
+                if (prevBuildDate != currentBuildDate) {
+                    def statusSymbol = '\u2753'
+                    switch(currentBuild.result) {
+                        case 'SUCCESS':
+                            statusSymbol = '\u2705'
+                            break;
+                        case 'UNSTABLE':
+                        case 'FAILURE':
+                            statusSymbol = '\u274c'
+                            break;
+                        default:
+                            break;
+                    }
+
+                    echo('First build for this date, sending summary email')
+                    emailext to: '$DEFAULT_RECIPIENTS',
+                        subject: "$statusSymbol" + '$BRANCH_NAME regression tests - $BUILD_STATUS',
+                        mimeType: 'text/html',
+                        body: '${SCRIPT, template="groovy-html.template"}'
+                } else {
+                    echo('Already sent summary email today, suppressing')
+                }
+            }
         }
         cleanup {
             deleteDir() /* clean up our workspace */

diff --git a/.ci/dev/smoke/Jenkinsfile b/.ci/dev/smoke/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('existing-build-control')
+@Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())

diff --git a/.ci/dev/unit/Jenkinsfile b/.ci/dev/unit/Jenkinsfile
@@ -1,5 +1,5 @@
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
-@Library('existing-build-control')
+@Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
-@Library('existing-build-control')
+@Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
@@ -71,4 +71,4 @@ pipeline {
             deleteDir() /* clean up our workspace */
         }
     }
-}
+}
diff --git a/detekt-config.yml b/detekt-config.yml
@@ -172,7 +172,7 @@ style:
     ignoreNamedArgument: true
     ignoreEnums: true
   MaxLineLength:
-    active: true
+    active: false
     excludes: "**/buildSrc/**"
     maxLineLength: 140
     excludePackageStatements: true