INFRA-1746 tidy up

This commit is contained in:
ronanbrowne88 2022-05-01 11:35:50 +01:00
parent 9bda96ff0a
commit 7ce0ab2789

View File

@ -41,17 +41,6 @@ def nexusIqStageChoices = [nexusDefaultIqStage].plus(
'operate' 'operate'
].minus([nexusDefaultIqStage])) ].minus([nexusDefaultIqStage]))
/**
* define an empty teamsWebHookURL and if it is a Release Branch
* then set it for the Corda 4 Jenkins Connector
*/
def teamsWebHookURL = ""
if (isReleaseBranch || isReleaseTag){
withCredentials([string(credentialsId: 'ms-teams-webhook', variable: 'webhook_url')]) {
teamsWebHookURL = "$webhook_url"
}
}
/** /**
* Common Gradle arguments for all Gradle executions * Common Gradle arguments for all Gradle executions
*/ */
@ -72,33 +61,9 @@ pipeline {
*/ */
options { options {
buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14')) buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
office365ConnectorWebhooks([[
name : "Corda 4 Jenkins Connector",
notifyBackToNormal : true,
startNotification : false,
notifyFailure : true,
notifySuccess : true,
notifyNotBuilt : false,
notifyAborted : false,
notifyRepeatedFailure: true,
notifyUnstable : true,
url : "${teamsWebHookURL}"
]])
parallelsAlwaysFailFast() parallelsAlwaysFailFast()
timeout(time: 6, unit: 'HOURS') timeout(time: 6, unit: 'HOURS')
timestamps() timestamps()
office365ConnectorWebhooks([[
name : "Corda 4 Jenkins Connector",
notifyBackToNormal : true,
startNotification : false,
notifyFailure : true,
notifySuccess : true,
notifyNotBuilt : false,
notifyAborted : false,
notifyRepeatedFailure: true,
notifyUnstable : true,
url : "${teamsWebHookURL}"
]])
} }
parameters { parameters {