Merge pull request #6912 from corda/wz/merge-os-44-45-2021-06-03

NOTICK: Merging forward updates from OS 4.4 to OS 4.5 (2021-06-03)

.ci/dev/compatibility/JenkinsfileJDK11Compile

@@ -1,3 +1,8 @@
+#!groovy
+/**
+ * Jenkins pipeline to build Corda Opensource Pull Requests with JDK11.
+ */
+
 @Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
@@ -6,8 +11,8 @@ killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
 pipeline {
     agent {
         dockerfile {
-            label 'k8s'
+            label 'standard'
-            additionalBuildArgs "--build-arg USER=stresstester"
+            additionalBuildArgs '--build-arg USER="${USER}"' // DON'T change quotation - USER variable is substituted by SHELL!!!!
             filename '.ci/dev/compatibility/DockerfileJDK11'
         }
     }

.ci/dev/nightly-regression/Jenkinsfile

@@ -1,78 +1,167 @@
+#!groovy
+/**
+ * Jenkins pipeline to build Corda Opensource nightly regression for feature branches.
+ */
+
 @Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
 
+/**
+ * Common Gradle arguments for all Gradle executions
+ */
+String COMMON_GRADLE_PARAMS = [
+        '--no-daemon',
+        '--stacktrace',
+        '--info',
+        '-Pcompilation.warningsAsErrors=false',
+        '-Ptests.failFast=true',
+].join(' ')
+
 pipeline {
-    agent { label 'k8s' }
+    agent { label 'standard' }
+
+    /*
+     * List options in alphabetical order
+     */
     options {
-        timestamps()
-        overrideIndexTriggers(false)
-        timeout(time: 3, unit: 'HOURS')
         buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
+        overrideIndexTriggers(false)
+        parallelsAlwaysFailFast()
+        timeout(time: 6, unit: 'HOURS')
+        timestamps()
     }
+
     triggers {
         pollSCM ignorePostCommitHooks: true, scmpoll_spec: '@midnight'
     }
 
+    /*
+     * List environment variables in alphabetical order
+     */
     environment {
-        DOCKER_TAG_TO_USE = "${env.GIT_COMMIT.subSequence(0, 8)}"
-        EXECUTOR_NUMBER = "${env.EXECUTOR_NUMBER}"
-        BUILD_ID = "${env.BUILD_ID}-${env.JOB_NAME}"
         ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials')
-        CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}"
         CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}"
+        CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}"
     }
 
     stages {
-        stage('Deploy Nodes') {
+        stage('Compile') {
             steps {
-                sh "./gradlew --no-daemon jar deployNodes"
+                sh script: [
+                        './gradlew',
+                        COMMON_GRADLE_PARAMS,
+                        'clean',
+                        'jar'
+                ].join(' ')
             }
         }
 
-        stage('Generate Build Image') {
+        stage('Stash') {
             steps {
-                withCredentials([string(credentialsId: 'container_reg_passwd', variable: 'DOCKER_PUSH_PWD')]) {
+                stash name: 'compiled', useDefaultExcludes: false
-                    sh "./gradlew " +
-                            "-Dkubenetize=true " +
-                            "-Ddocker.push.password=\"\${DOCKER_PUSH_PWD}\" " +
-                            "-Ddocker.work.dir=\"/tmp/\${EXECUTOR_NUMBER}\" " +
-                            "-Ddocker.container.env.parameter.CORDA_ARTIFACTORY_USERNAME=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
-                            "-Ddocker.container.env.parameter.CORDA_ARTIFACTORY_PASSWORD=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
-                            "-Ddocker.build.tag=\"\${DOCKER_TAG_TO_USE}\"" +
-                            " clean pushBuildImage --stacktrace"
-                }
-                sh "kubectl auth can-i get pods"
             }
         }
 
-        stage('Testing phase') {
+        stage('All Tests') {
             parallel {
-                stage('Regression Test') {
+                stage('Another agent') {
-                    steps {
+                    agent {
-                        sh "./gradlew " +
+                        label 'standard'
-                                "-DbuildId=\"\${BUILD_ID}\" " +
+                    }
-                                "-Dkubenetize=true " +
+                    options {
-                                "-Ddocker.run.tag=\"\${DOCKER_TAG_TO_USE}\" " +
+                        skipDefaultCheckout true
-                                "-Dartifactory.username=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                    }
-                                "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
+                    post {
-                                "-Dgit.branch=\"\${GIT_BRANCH}\" " +
+                        always {
-                                "-Dgit.target.branch=\"\${GIT_BRANCH}\" " +
+                            archiveArtifacts artifacts: '**/*.log', fingerprint: false
-                                " parallelRegressionTest --stacktrace"
+                            junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true
+                        }
+                        cleanup {
+                            deleteDir() /* clean up our workspace */
+                        }
+                    }
+                    stages {
+                        stage('Unstash') {
+                            steps {
+                                unstash 'compiled'
+                            }
+                        }
+                        stage('Recompile') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'jar'
+                                ].join(' ')
+                            }
+                        }
+                        stage('Unit Test') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'test'
+                                ].join(' ')
+                            }
+                        }
+                        stage('Proxy Integration Test') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'proxyIntegrationTest'
+                                ].join(' ')
+                            }
+                        }
+                        stage('Smoke Test') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'smokeTest'
+                                ].join(' ')
+                            }
+                        }
+                        stage('Slow Integration Test') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'slowIntegrationTest'
+                                ].join(' ')
+                            }
+                        }
                     }
                 }
-                stage('Slow Integration Test') {
+                stage('Same agent') {
-                    steps {
+                    post {
-                        sh "./gradlew " +
+                        always {
-                                "-DbuildId=\"\${BUILD_ID}\" " +
+                            archiveArtifacts artifacts: '**/*.log', fingerprint: false
-                                "-Dkubenetize=true " +
+                            junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true
-                                "-Ddocker.run.tag=\"\${DOCKER_TAG_TO_USE}\" " +
+                        }
-                                "-Dartifactory.username=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                    }
-                                "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
+                    stages {
-                                "-Dgit.branch=\"\${GIT_BRANCH}\" " +
+                        stage('Integration Test') {
-                                "-Dgit.target.branch=\"\${GIT_BRANCH}\" " +
+                            steps {
-                                " allParallelSlowIntegrationTest --stacktrace"
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'integrationTest'
+                                ].join(' ')
+                            }
+                        }
+
+                        stage('Deploy Node') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'deployNode'
+                                ].join(' ')
+                            }
+                        }
                     }
                 }
             }
@@ -80,10 +169,6 @@ pipeline {
     }
 
     post {
-        always {
-            archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
-            junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
-        }
         cleanup {
             deleteDir() /* clean up our workspace */
         }

.ci/dev/pr-code-checks/Jenkinsfile

@@ -11,20 +11,9 @@ pipeline {
         buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
     }
 
-    environment {
-        PR_CONTEXT_STRING = "PR Code Checks"
-    }
-
     stages {
         stage('Detekt check') {
             steps {
-                script {
-                    pullRequest.createStatus(
-                            status: 'pending',
-                            context: "${PR_CONTEXT_STRING}",
-                            description: "Running code checks",
-                            targetUrl: "${env.BUILD_URL}")
-                }
                 sh "./gradlew --no-daemon clean detekt"
             }
         }
@@ -50,25 +39,6 @@ pipeline {
     }
 
     post {
-        success {
-            script {
-                pullRequest.createStatus(
-                        status: 'success',
-                        context: "${PR_CONTEXT_STRING}",
-                        description: 'Code checks passed',
-                        targetUrl: "${env.BUILD_URL}")
-            }
-        }
-
-        failure {
-            script {
-                pullRequest.createStatus(
-                        status: 'failure',
-                        context: "${PR_CONTEXT_STRING}",
-                        description: 'Code checks failed',
-                        targetUrl: "${env.BUILD_URL}")
-            }
-        }
         cleanup {
             deleteDir() /* clean up our workspace */
         }

.ci/dev/publish-branch/Jenkinsfile.preview

@@ -1,11 +1,15 @@
 #!groovy
+/**
+ * Jenkins pipeline to build Corda Opensource Preview.
+ */
+
 @Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
 
 pipeline {
-    agent { label 'k8s' }
+    agent { label 'standard' }
 
     options {
         timestamps()

Jenkinsfile

@@ -1,73 +1,133 @@
-import static com.r3.build.BuildControl.killAllExistingBuildsForJob
+#!groovy
+/**
+ * Jenkins pipeline to build Corda Opensource Pull Requests.
+ */
+
 @Library('corda-shared-build-pipeline-steps')
 import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
 
+/**
+ * Common Gradle arguments for all Gradle executions
+ */
+String COMMON_GRADLE_PARAMS = [
+        '--no-daemon',
+        '--stacktrace',
+        '--info',
+        /*
+        ** revert default behavour for `ignoreFailures` and
+        ** do not ignore test failures in PR builds
+        */
+        '-Ptests.ignoreFailures=false',
+        '-Pcompilation.warningsAsErrors=false',
+        '-Ptests.failFast=true',
+        '-Ddependx.branch.origin="${GIT_COMMIT}"',    // DON'T change quotation - GIT_COMMIT variable is substituted by SHELL!!!!
+        '-Ddependx.branch.target="${CHANGE_TARGET}"', // DON'T change quotation - CHANGE_TARGET variable is substituted by SHELL!!!!
+].join(' ')
+
 pipeline {
-    agent { label 'k8s' }
+    agent { label 'standard' }
+
+    /*
+     * List options in alphabetical order
+     */
     options {
-        timestamps()
+        ansiColor('xterm')
-        timeout(time: 3, unit: 'HOURS')
         buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
+        parallelsAlwaysFailFast()
+        timeout(time: 6, unit: 'HOURS')
+        timestamps()
     }
 
+    /*
+     * List environment variables in alphabetical order
+     */
     environment {
-        DOCKER_TAG_TO_USE = "${env.GIT_COMMIT.subSequence(0, 8)}"
-        EXECUTOR_NUMBER = "${env.EXECUTOR_NUMBER}"
-        BUILD_ID = "${env.BUILD_ID}-${env.JOB_NAME}"
         ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials')
-        CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}"
         CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}"
+        CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}"
     }
 
     stages {
-        stage('Corda Pull Request - Generate Build Image') {
+        stage('Compile') {
             steps {
-                withCredentials([string(credentialsId: 'container_reg_passwd', variable: 'DOCKER_PUSH_PWD')]) {
+                sh script: [
-                    sh "./gradlew --no-daemon " +
+                        './gradlew',
-                            "-Dkubenetize=true " +
+                        COMMON_GRADLE_PARAMS,
-                            "-Ddocker.push.password=\"\${DOCKER_PUSH_PWD}\" " +
+                        'clean',
-                            "-Ddocker.work.dir=\"/tmp/\${EXECUTOR_NUMBER}\" " +
+                        'jar'
-                            "-Ddocker.container.env.parameter.CORDA_ARTIFACTORY_USERNAME=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                ].join(' ')
-                            "-Ddocker.container.env.parameter.CORDA_ARTIFACTORY_PASSWORD=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
-                            "-Ddocker.build.tag=\"\${DOCKER_TAG_TO_USE}\"" +
-                            " clean preAllocateForAllParallelUnitTest preAllocateForAllParallelIntegrationTest pushBuildImage --stacktrace"
-                }
-                sh "kubectl auth can-i get pods"
             }
         }
 
-        stage('Corda Pull Request - Run Tests') {
+        stage('Stash') {
+            steps {
+                stash name: 'compiled', useDefaultExcludes: false
+            }
+        }
+
+        stage('All Tests') {
             parallel {
-                stage('Integration Tests') {
+                stage('Another agent') {
-                    steps {
+                    agent {
-                        sh "./gradlew --no-daemon " +
+                        label 'standard'
-                                "-DbuildId=\"\${BUILD_ID}\" " +
+                    }
-                                "-Dkubenetize=true " +
+                    options {
-                                "-Ddocker.run.tag=\"\${DOCKER_TAG_TO_USE}\" " +
+                        skipDefaultCheckout true
-                                "-Dartifactory.username=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                    }
-                                "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
+                    post {
-                                "-Dgit.branch=\"\${GIT_BRANCH}\" " +
+                        always {
-                                "-Dgit.target.branch=\"\${CHANGE_TARGET}\" " +
+                            archiveArtifacts artifacts: '**/*.log', fingerprint: false
-                                "-Ddependx.branch.origin=${env.GIT_COMMIT} " +
+                            junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true
-                                "-Ddependx.branch.target=${CHANGE_TARGET} " +
+                        }
-                                " allParallelIntegrationTest  --stacktrace"
+                        cleanup {
+                            deleteDir() /* clean up our workspace */
+                        }
+                    }
+                    stages {
+                        stage('Unstash') {
+                            steps {
+                                unstash 'compiled'
+                            }
+                        }
+                        stage('Recompile') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'jar'
+                                ].join(' ')
+                            }
+                        }
+                        stage('Unit Test') {
+                            steps {
+                                sh script: [
+                                        './gradlew',
+                                        COMMON_GRADLE_PARAMS,
+                                        'test'
+                                ].join(' ')
+                            }
+                        }
                     }
                 }
-                stage('Unit Tests') {
+                stage('Same agent') {
-                    steps {
+                    post {
-                        sh "./gradlew --no-daemon " +
+                        always {
-                                "-DbuildId=\"\${BUILD_ID}\" " +
+                            archiveArtifacts artifacts: '**/*.log', fingerprint: false
-                                "-Dkubenetize=true " +
+                            junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true
-                                "-Ddocker.run.tag=\"\${DOCKER_TAG_TO_USE}\" " +
+                        }
-                                "-Dartifactory.username=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                    }
-                                "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
+                    stages {
-                                "-Dgit.branch=\"\${GIT_BRANCH}\" " +
+                        stage('Integration Test') {
-                                "-Dgit.target.branch=\"\${CHANGE_TARGET}\" " +
+                            steps {
-                                "-Ddependx.branch.origin=${env.GIT_COMMIT} " +
+                                sh script: [
-                                "-Ddependx.branch.target=${CHANGE_TARGET} " +
+                                        './gradlew',
-                                " allParallelUnitTest --stacktrace"
+                                        COMMON_GRADLE_PARAMS,
+                                        'integrationTest'
+                                ].join(' ')
+                            }
+                        }
                     }
                 }
             }
@@ -75,10 +135,6 @@ pipeline {
     }
 
     post {
-        always {
-            archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
-            junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
-        }
         cleanup {
             deleteDir() /* clean up our workspace */
         }