From 75ae0e5f031b63b75cff65358237b45e544e0ce9 Mon Sep 17 00:00:00 2001 From: Marcus Holl Date: Thu, 25 Oct 2018 14:11:11 +0200 Subject: [PATCH] add field GENERAL_CONFIG_KEYS to artifactSetVersion step --- vars/artifactSetVersion.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vars/artifactSetVersion.groovy b/vars/artifactSetVersion.groovy index 7df77bd32..773281413 100644 --- a/vars/artifactSetVersion.groovy +++ b/vars/artifactSetVersion.groovy @@ -8,6 +8,9 @@ import groovy.text.SimpleTemplateEngine @Field String STEP_NAME = 'artifactSetVersion' @Field Map CONFIG_KEY_COMPATIBILITY = [gitSshKeyCredentialsId: 'gitCredentialsId'] + +@Field Set GENERAL_CONFIG_KEYS = STEP_CONFIG_KEYS + @Field Set STEP_CONFIG_KEYS = [ 'artifactType', 'buildTool', @@ -23,6 +26,7 @@ import groovy.text.SimpleTemplateEngine 'timestampTemplate', 'versioningTemplate' ] + @Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS.plus('gitCommitId') void call(Map parameters = [:], Closure body = null) { @@ -43,7 +47,7 @@ void call(Map parameters = [:], Closure body = null) { // load default & individual configuration ConfigurationHelper configHelper = ConfigurationHelper.newInstance(this) .loadStepDefaults() - .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY) + .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY) .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY) .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY) .mixin(gitCommitId: gitUtils.getGitCommitIdOrNull())