ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TM-209: Dependx introduction for test running optimization (#6036)

Browse Source 
* Add dependx step to build, in monitor state

* Bump plugin version

* Update plugin version

Co-authored-by: Dimitris Gounaris <dimitrisgounaris@20LDN-MAC257.local>
This commit is contained in:
Dimitris Gounaris 2020-03-11 10:51:38 +00:00 committed by GitHub
parent 68bb7a0e7b
commit 67e3e09a4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -45,6 +45,8 @@ pipeline {
"-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " + "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
"-Dgit.branch=\"\${GIT_BRANCH}\" " + "-Dgit.branch=\"\${GIT_BRANCH}\" " +
"-Dgit.target.branch=\"\${CHANGE_TARGET}\" " + "-Dgit.target.branch=\"\${CHANGE_TARGET}\" " +
"-Ddependx.branch.origin=${env.GIT_COMMIT} " +
"-Ddependx.branch.target=${CHANGE_TARGET} " +
" allParallelIntegrationTest --stacktrace" " allParallelIntegrationTest --stacktrace"
} }
} }
@ -58,6 +60,8 @@ pipeline {
"-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " + "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
"-Dgit.branch=\"\${GIT_BRANCH}\" " + "-Dgit.branch=\"\${GIT_BRANCH}\" " +
"-Dgit.target.branch=\"\${CHANGE_TARGET}\" " + "-Dgit.target.branch=\"\${CHANGE_TARGET}\" " +
"-Ddependx.branch.origin=${env.GIT_COMMIT} " +
"-Ddependx.branch.target=${CHANGE_TARGET} " +
" allParallelUnitTest --stacktrace" " allParallelUnitTest --stacktrace"
} }
} }

13
build.gradle
View File

@ -187,6 +187,7 @@ buildscript {
// See https://github.com/corda/gradle-capsule-plugin // See https://github.com/corda/gradle-capsule-plugin
classpath "us.kirchmeier:gradle-capsule-plugin:1.0.4_r3" classpath "us.kirchmeier:gradle-capsule-plugin:1.0.4_r3"
classpath group: "com.r3.testing", name: "gradle-distributed-testing-plugin", version: "1.2-LOCAL-K8S-SHARED-CACHE-SNAPSHOT", changing: true classpath group: "com.r3.testing", name: "gradle-distributed-testing-plugin", version: "1.2-LOCAL-K8S-SHARED-CACHE-SNAPSHOT", changing: true
classpath group: "com.r3.dependx", name: "gradle-dependx", version: "0.1.12", changing: true
classpath "com.bmuschko:gradle-docker-plugin:5.0.0" classpath "com.bmuschko:gradle-docker-plugin:5.0.0"
} }
} }
@ -204,6 +205,7 @@ apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.artifactory' apply plugin: 'com.jfrog.artifactory'
apply plugin: "com.bmuschko.docker-remote-api" apply plugin: "com.bmuschko.docker-remote-api"
apply plugin: "com.r3.dependx.dependxies"
// If the command line project option -PversionFromGit is added to the gradle invocation, we'll resolve // If the command line project option -PversionFromGit is added to the gradle invocation, we'll resolve
@ -583,6 +585,11 @@ artifactory {
} }
} }
dependxiesModule {
mode = "monitor"
skipTasks = "test,integrationTest,smokeTest,slowIntegrationTest"
}
task generateApi(type: net.corda.plugins.GenerateApi) { task generateApi(type: net.corda.plugins.GenerateApi) {
baseName = "api-corda" baseName = "api-corda"
} }
@ -629,6 +636,7 @@ buildScan {
} }
task allParallelIntegrationTest(type: ParallelTestGroup) { task allParallelIntegrationTest(type: ParallelTestGroup) {
dependsOn dependxiesModule
podLogLevel PodLogLevel.INFO podLogLevel PodLogLevel.INFO
testGroups "integrationTest" testGroups "integrationTest"
numberOfShards 10 numberOfShards 10
@ -639,6 +647,7 @@ task allParallelIntegrationTest(type: ParallelTestGroup) {
nodeTaints "big" nodeTaints "big"
} }
task allParallelUnitTest(type: ParallelTestGroup) { task allParallelUnitTest(type: ParallelTestGroup) {
dependsOn dependxiesModule
podLogLevel PodLogLevel.INFO podLogLevel PodLogLevel.INFO
testGroups "test" testGroups "test"
numberOfShards 10 numberOfShards 10
@ -649,6 +658,7 @@ task allParallelUnitTest(type: ParallelTestGroup) {
nodeTaints "small" nodeTaints "small"
} }
task allParallelUnitAndIntegrationTest(type: ParallelTestGroup) { task allParallelUnitAndIntegrationTest(type: ParallelTestGroup) {
dependsOn dependxiesModule
testGroups "test", "integrationTest" testGroups "test", "integrationTest"
numberOfShards 15 numberOfShards 15
streamOutput false streamOutput false
@ -659,6 +669,7 @@ task allParallelUnitAndIntegrationTest(type: ParallelTestGroup) {
} }
task parallelRegressionTest(type: ParallelTestGroup) { task parallelRegressionTest(type: ParallelTestGroup) {
testGroups "test", "integrationTest", "smokeTest" testGroups "test", "integrationTest", "smokeTest"
dependsOn dependxiesModule
numberOfShards 15 numberOfShards 15
streamOutput false streamOutput false
coresPerFork 2 coresPerFork 2
@ -668,6 +679,7 @@ task parallelRegressionTest(type: ParallelTestGroup) {
} }
task allParallelSmokeTest(type: ParallelTestGroup) { task allParallelSmokeTest(type: ParallelTestGroup) {
testGroups "smokeTest" testGroups "smokeTest"
dependsOn dependxiesModule
numberOfShards 4 numberOfShards 4
streamOutput false streamOutput false
coresPerFork 6 coresPerFork 6
@ -677,6 +689,7 @@ task allParallelSmokeTest(type: ParallelTestGroup) {
} }
task allParallelSlowIntegrationTest(type: ParallelTestGroup) { task allParallelSlowIntegrationTest(type: ParallelTestGroup) {
testGroups "slowIntegrationTest" testGroups "slowIntegrationTest"
dependsOn dependxiesModule
numberOfShards 4 numberOfShards 4
streamOutput false streamOutput false
coresPerFork 6 coresPerFork 6