TM-204 Modifying regression builds to prevent bad dependency graphs (#6013)

* TM-204 attempting to fix regression builds

* TM-204 attempting to fix regression builds

* TM-204 reverting spring boot version and only removing missing dependency

* TM-204 reverting to original build.gradle

* TM-204 re applying dependency

* TM-204 consolidating dependencies

* TM-204 setting spring boot dependency

* TM-204 reverting and upgrading dependency management plugin version in parent gradle file

* TM-204 apply dependency plugin differently

* TM-204 new gradle files

* TM-204 try and fix corda rpc evaluation

* TM-204 try and fix corda rpc evaluation

* TM-204 separate slow integration and smoke test

* TM-204 modifying regression builds to separate slow integration tests and smoke tests as they sometimes result in a bad gradle dependency graph

* TM-204 separating slow integration tests from the rest

* TM-204 change to allow ci03 to run this jenkinsfile

* TM-204 switching to aks label to allow testing on ci03

* TM-204 now that test was successful, switching back to correct prod label

.ci/dev/nightly-regression/Jenkinsfile

@@ -23,7 +23,7 @@ pipeline {
     }
 
     stages {
-        stage('Generate Build Image') {
+            stage('Corda Pull Request - Generate Build Image') {
                 steps {
                     withCredentials([string(credentialsId: 'container_reg_passwd', variable: 'DOCKER_PUSH_PWD')]) {
                         sh "./gradlew " +
@@ -37,6 +37,8 @@ pipeline {
                 }
             }
 
+            stage('Testing phase') {
+                parallel {
                     stage('Regression Test') {
                         steps {
                             sh "./gradlew " +
@@ -50,6 +52,21 @@ pipeline {
                                     " parallelRegressionTest --stacktrace"
                         }
                     }
+                    stage('Slow Integration Test') {
+                        steps {
+                            sh "./gradlew " +
+                                    "-DbuildId=\"\${BUILD_ID}\" " +
+                                    "-Dkubenetize=true " +
+                                    "-Ddocker.run.tag=\"\${DOCKER_TAG_TO_USE}\" " +
+                                    "-Dartifactory.username=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                                    "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
+                                    "-Dgit.branch=\"\${GIT_BRANCH}\" " +
+                                    "-Dgit.target.branch=\"\${GIT_BRANCH}\" " +
+                                    " allParallelSlowIntegrationTest --stacktrace"
+                        }
+                    }
+                }
+            }
         }
 
 

.ci/dev/regression/Jenkinsfile

@@ -33,6 +33,8 @@ pipeline {
             }
         }
 
+        stage('Testing phase') {
+            parallel {
                 stage('Regression Test') {
                     steps {
                         sh "./gradlew " +
@@ -46,6 +48,21 @@ pipeline {
                                 " parallelRegressionTest --stacktrace"
                     }
                 }
+                stage('Slow Integration Test') {
+                    steps {
+                        sh "./gradlew " +
+                                "-DbuildId=\"\${BUILD_ID}\" " +
+                                "-Dkubenetize=true " +
+                                "-Ddocker.run.tag=\"\${DOCKER_TAG_TO_USE}\" " +
+                                "-Dartifactory.username=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                                "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
+                                "-Dgit.branch=\"\${GIT_BRANCH}\" " +
+                                "-Dgit.target.branch=\"\${GIT_BRANCH}\" " +
+                                " allParallelSlowIntegrationTest --stacktrace"
+                    }
+                }
+            }
+        }
     }
 
 

build.gradle

@@ -663,7 +663,7 @@ task allParallelUnitAndIntegrationTest(type: ParallelTestGroup) {
     nodeTaints "big"
 }
 task parallelRegressionTest(type: ParallelTestGroup) {
-    testGroups "test", "integrationTest", "slowIntegrationTest", "smokeTest"
+    testGroups "test", "integrationTest", "smokeTest"
     numberOfShards 15
     streamOutput false
     coresPerFork 2