jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

Make gitSshUrl non-mandatory (#246)

Browse Source 
* Update artifactSetVersion.groovy

* Update artifactSetVersion.groovy

* Update artifactSetVersion.groovy

* fix build

* Avoid updating configuration map outside configuration helper
This commit is contained in:
Ramachandra Kamath Arbettu
2018-08-16 09:43:32 +02:00
committed by Christopher Fenner
parent 7ab2c3ee22
commit 2716054392
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vars/artifactSetVersion.groovy
View File

@@ -41,7 +41,7 @@ def call(Map parameters = [:], Closure body = null) {
script = this
// load default & individual configuration
Map config = ConfigurationHelper
ConfigurationHelper configHelper = ConfigurationHelper
.loadStepDefaults(this)
.mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, this, CONFIG_KEY_COMPATIBILITY)
.mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, this, CONFIG_KEY_COMPATIBILITY)
@@ -51,13 +51,11 @@ def call(Map parameters = [:], Closure body = null) {
.withMandatoryProperty('buildTool')
.dependingOn('buildTool').mixin('filePath')
.dependingOn('buildTool').mixin('versioningTemplate')
.use()
config = new ConfigurationHelper(config)
.addIfEmpty('gitSshUrl', (config.buildTool == 'docker' && config.artifactType == 'appContainer')?script.commonPipelineEnvironment.getAppContainerProperty('gitSshUrl'):script.commonPipelineEnvironment.getGitSshUrl())
.addIfEmpty('timestamp', getTimestamp(config.timestampTemplate))
.withMandatoryProperty('gitSshUrl')
.use()
Map config = configHelper.use()
config = configHelper.addIfEmpty('timestamp', getTimestamp(config.timestampTemplate))
.use()
new Utils().pushToSWA([step: STEP_NAME, stepParam1: config.buildTool, stepParam2: config.artifactType], config)
@@ -79,6 +77,13 @@ def call(Map parameters = [:], Closure body = null) {
}
if (config.commitVersion) {
config = new ConfigurationHelper(config)
.addIfEmpty('gitSshUrl', isAppContainer(config)
?script.commonPipelineEnvironment.getAppContainerProperty('gitSshUrl')
:script.commonPipelineEnvironment.getGitSshUrl())
.withMandatoryProperty('gitSshUrl')
.use()
sh 'git add .'
sshagent([config.gitSshKeyCredentialsId]) {
@@ -99,7 +104,7 @@ def call(Map parameters = [:], Closure body = null) {
}
}
if (config.buildTool == 'docker' && config.artifactType == 'appContainer') {
if (isAppContainer(config)) {
script.commonPipelineEnvironment.setAppContainerProperty('artifactVersion', newVersion)
script.commonPipelineEnvironment.setAppContainerProperty('gitCommitId', config.gitCommitId)
} else {
@@ -112,6 +117,10 @@ def call(Map parameters = [:], Closure body = null) {
}
}
def isAppContainer(config){
return config.buildTool == 'docker' && config.artifactType == 'appContainer'
}
def getTimestamp(pattern){
return sh(returnStdout: true, script: "date --universal +'${pattern}'").trim()
}