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

Merge branch 'release/os/4.5' into wz/merge-os-45-46-2020-07-22

Browse Source
This commit is contained in:
Waldemar Zurowski 2020-07-22 13:00:42 +01:00
commit 8ee070953a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/dev/pr-code-checks/Jenkinsfile vendored
View File

@ -4,7 +4,7 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger()) killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
pipeline { pipeline {
agent { label 'k8s' } agent { label 'standard' }
options { options {
timestamps() timestamps()
timeout(time: 3, unit: 'HOURS') timeout(time: 3, unit: 'HOURS')

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

@ -61,14 +61,15 @@ pipeline {
sh "./gradlew --no-daemon clean jar" sh "./gradlew --no-daemon clean jar"
script { script {
sh "./gradlew --no-daemon properties | grep -E '^(version|group):' >version-properties" sh "./gradlew --no-daemon properties | grep -E '^(version|group):' >version-properties"
def version = sh (returnStdout: true, script: "grep ^version: version-properties | sed -e 's/^version: //'").trim() /* every build related to Corda X.Y (GA, RC, HC, patch or snapshot) uses the same NexusIQ application */
def version = sh (returnStdout: true, script: "grep ^version: version-properties | sed -e 's/^version: \\([0-9]\\+\\.[0-9]\\+\\).*\$/\\1/'").trim()
def groupId = sh (returnStdout: true, script: "grep ^group: version-properties | sed -e 's/^group: //'").trim() def groupId = sh (returnStdout: true, script: "grep ^group: version-properties | sed -e 's/^group: //'").trim()
def artifactId = 'corda' def artifactId = 'corda'
nexusAppId = "jenkins-${groupId}-${artifactId}-${version}" nexusAppId = "jenkins-${groupId}-${artifactId}-${version}"
} }
nexusPolicyEvaluation ( nexusPolicyEvaluation (
failBuildOnNetworkError: false, failBuildOnNetworkError: false,
iqApplication: manualApplication(nexusAppId), iqApplication: selectedApplication(nexusAppId), // application *has* to exist before a build starts!
iqScanPatterns: [[scanPattern: 'node/capsule/build/libs/corda*.jar']], iqScanPatterns: [[scanPattern: 'node/capsule/build/libs/corda*.jar']],
iqStage: nexusIqStage iqStage: nexusIqStage
) )