1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-14 11:03:09 +02:00

Adjust naming for config keys for step batsExecuteTest

This commit is contained in:
Marcus Holl 2018-10-25 15:00:11 +02:00
parent c7b05e9294
commit 749ddbef71

View File

@ -5,6 +5,9 @@ import groovy.text.SimpleTemplateEngine
import groovy.transform.Field import groovy.transform.Field
@Field String STEP_NAME = 'batsExecuteTests' @Field String STEP_NAME = 'batsExecuteTests'
@Field Set GENERAL_CONFIG_KEYS = STEP_CONFIG_KEYS
@Field Set STEP_CONFIG_KEYS = [ @Field Set STEP_CONFIG_KEYS = [
'dockerImage', 'dockerImage',
'dockerWorkspace', 'dockerWorkspace',
@ -19,6 +22,7 @@ import groovy.transform.Field
'testPath', 'testPath',
'testRepository' 'testRepository'
] ]
@Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS @Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS
void call(Map parameters = [:]) { void call(Map parameters = [:]) {
@ -29,7 +33,7 @@ void call(Map parameters = [:]) {
Map config = ConfigurationHelper.newInstance(this) Map config = ConfigurationHelper.newInstance(this)
.loadStepDefaults() .loadStepDefaults()
.mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS) .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
.mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS) .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
.mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS) .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
.mixin(parameters, PARAMETER_KEYS) .mixin(parameters, PARAMETER_KEYS)