ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-11 21:31:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5919 from corda/release/os/4.4

Browse Source 
MERGE 4.4 -> 4.5 OS
This commit is contained in:
Stefano Franz 2020-02-04 09:19:41 +00:00 committed by GitHub
commit 33ce8bf31e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/dev/integration/Jenkinsfile vendored
View File

@ -5,7 +5,7 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
pipeline {
agent { label 'k8s' }
agent { label 'local-k8s' }
options { timestamps() }
environment {

2
.ci/dev/nightly-regression/Jenkinsfile vendored
View File

@ -4,7 +4,7 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
pipeline {
agent { label 'k8s' }
agent { label 'local-k8s' }
options {
timestamps()
overrideIndexTriggers(false)

2
.ci/dev/on-demand-tests/Jenkinsfile vendored
View File

@ -3,4 +3,4 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
onDemandTestPipeline('k8s', '.ci/dev/on-demand-tests/commentMappings.yml')
onDemandTestPipeline('local-k8s', '.ci/dev/on-demand-tests/commentMappings.yml')

2
.ci/dev/regression/Jenkinsfile vendored
View File

@ -4,7 +4,7 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
pipeline {
agent { label 'gke' }
agent { label 'local-k8s' }
options {
timestamps()
buildDiscarder(logRotator(daysToKeepStr: '7', artifactDaysToKeepStr: '7'))

2
.ci/dev/smoke/Jenkinsfile vendored
View File

@ -4,7 +4,7 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
pipeline {
agent { label 'k8s' }
agent { label 'local-k8s' }
options { timestamps()
overrideIndexTriggers(false) }

2
.ci/dev/unit/Jenkinsfile vendored
View File

@ -5,7 +5,7 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
pipeline {
agent { label 'k8s' }
agent { label 'local-k8s' }
options { timestamps() }
environment {

6
build.gradle
View File

@ -193,7 +193,7 @@ plugins {
id 'com.github.johnrengelman.shadow' version '2.0.4' apply false
id "com.gradle.build-scan" version "2.2.1"
id "org.ajoberstar.grgit" version "4.0.0"
}
}
apply plugin: 'project-report'
apply plugin: 'com.github.ben-manes.versions'
@ -660,9 +660,9 @@ task allParallelUnitAndIntegrationTest(type: ParallelTestGroup) {
}
task parallelRegressionTest(type: ParallelTestGroup) {
testGroups "test", "integrationTest", "slowIntegrationTest", "smokeTest"
numberOfShards 6
numberOfShards 15
streamOutput false
coresPerFork 6
coresPerFork 2
memoryInGbPerFork 10
distribute DistributeTestsBy.METHOD
nodeTaints "big"