ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 09:48:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6385 from corda/release/os/4.5

Browse Source 
NOTICK Merge OS 4.5 -> OS 4.6
This commit is contained in:
Waldemar Żurowski 2020-06-20 16:44:14 +01:00 committed by GitHub
commit 1a7e302d5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.ci/dev/compatibility/JenkinsfileJDK11Azul
View File

@ -10,11 +10,7 @@ boolean isReleaseTag = (env.TAG_NAME =~ /^release.*JDK11$/)
pipeline { pipeline {
agent { agent {
dockerfile { label 'k8s'
label 'k8s'
additionalBuildArgs "--build-arg USER=stresstester"
filename '.ci/dev/compatibility/DockerfileJDK11'
}
} }
options { options {
timestamps() timestamps()
@ -79,6 +75,13 @@ pipeline {
} }
stage('Publish to Artifactory') { stage('Publish to Artifactory') {
agent {
dockerfile {
reuseNode true
additionalBuildArgs "--build-arg USER=stresstester"
filename '.ci/dev/compatibility/DockerfileJDK11'
}
}
when { when {
expression { isReleaseTag } expression { isReleaseTag }
} }

7
.ci/dev/mswin/Jenkinsfile vendored
View File

@ -28,6 +28,13 @@ pipeline {
ansiColor('xterm') ansiColor('xterm')
timestamps() timestamps()
timeout(time: 3, unit: 'HOURS') timeout(time: 3, unit: 'HOURS')
/*
* a bit awkward to read
* is parameter is true -> push events are *not* ignored
* if parameter is false -> push events *are* ignored
*/
overrideIndexTriggers (!isReleaseBranch)
} }
parameters { parameters {

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

@ -17,7 +17,7 @@ killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
/** /**
* Sense environment * Sense environment
*/ */
boolean isTag = (env.TAG_NAME =~ /^release-V(\d+\.\d+)?(\.\d+)?(-.+)?$/) boolean isReleaseTag = (env.TAG_NAME =~ /^release-.*(?<!_JDK11)$/)
pipeline { pipeline {
agent { label 'k8s' } agent { label 'k8s' }
@ -33,6 +33,7 @@ pipeline {
EXECUTOR_NUMBER = "${env.EXECUTOR_NUMBER}" EXECUTOR_NUMBER = "${env.EXECUTOR_NUMBER}"
BUILD_ID = "${env.BUILD_ID}-${env.JOB_NAME}" BUILD_ID = "${env.BUILD_ID}-${env.JOB_NAME}"
ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials')
ARTIFACTORY_BUILD_NAME = "Corda / Publish / Publish Release to Artifactory".replaceAll("/", "::")
} }
stages { stages {
@ -86,6 +87,36 @@ pipeline {
} }
} }
} }
stage('Publish to Artifactory') {
when {
expression { isReleaseTag }
}
steps {
rtServer(
id: 'R3-Artifactory',
url: 'https://software.r3.com/artifactory',
credentialsId: 'artifactory-credentials'
)
rtGradleDeployer(
id: 'deployer',
serverId: 'R3-Artifactory',
repo: 'r3-corda-releases'
)
rtGradleRun(
usesPlugin: true,
useWrapper: true,
switches: '-s --info',
tasks: 'artifactoryPublish',
deployerId: 'deployer',
buildName: env.ARTIFACTORY_BUILD_NAME
)
rtPublishBuildInfo(
serverId: 'R3-Artifactory',
buildName: env.ARTIFACTORY_BUILD_NAME
)
}
}
} }
@ -127,7 +158,7 @@ pipeline {
script script
{ {
if (!isTag) { if (!isReleaseTag) {
// We want to send a summary email, but want to limit to once per day. // We want to send a summary email, but want to limit to once per day.
// Comparing the dates of the previous and current builds achieves this, // Comparing the dates of the previous and current builds achieves this,
// i.e. we will only send an email for the first build on a given day. // i.e. we will only send an email for the first build on a given day.