mirror of
https://github.com/corda/corda.git
synced 2025-01-30 16:14:39 +00:00
Merge branch 'release/os/4.5' into wz/merge-os-45-46-2020-07-23
This commit is contained in:
commit
0b1ccb48d0
@ -30,7 +30,7 @@ if (isReleaseTag) {
|
|||||||
switch (env.TAG_NAME) {
|
switch (env.TAG_NAME) {
|
||||||
case ~/.*-RC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
case ~/.*-RC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
||||||
case ~/.*-HC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
case ~/.*-HC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
||||||
default: nexusIqStage = "operate"
|
default: nexusIqStage = "release"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -165,7 +165,7 @@ pipeline {
|
|||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
|
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
|
||||||
junit testResults: '**/build/test-results-xml/**/*.xml'
|
junit testResults: '**/build/test-results-xml/**/*.xml', keepLongStdio: true
|
||||||
}
|
}
|
||||||
cleanup {
|
cleanup {
|
||||||
deleteDir() /* clean up our workspace */
|
deleteDir() /* clean up our workspace */
|
||||||
|
3
.ci/dev/regression/Jenkinsfile
vendored
3
.ci/dev/regression/Jenkinsfile
vendored
@ -30,7 +30,7 @@ if (isReleaseTag) {
|
|||||||
switch (env.TAG_NAME) {
|
switch (env.TAG_NAME) {
|
||||||
case ~/.*-RC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
case ~/.*-RC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
||||||
case ~/.*-HC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
case ~/.*-HC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
|
||||||
default: nexusIqStage = "operate"
|
default: nexusIqStage = "release"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,7 +175,6 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
|
archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user