Merge 59d4e62 into c560688

SAP · Aug 15, 2018 · 71c5b8f · 71c5b8f
2 parents c560688 + 59d4e62
commit 71c5b8f
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 57 deletions.
diff --git a/vars/checkChangeInDevelopment.groovy b/vars/checkChangeInDevelopment.groovy
@@ -30,21 +30,21 @@ def call(parameters = [:]) {
         ChangeManagement cm = parameters?.cmUtils ?: new ChangeManagement(script, gitUtils)
 
         ConfigurationHelper configHelper = ConfigurationHelper
-                                           .loadStepDefaults(this)
-                                           .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
-                                           .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
-                                           .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
-                                           .mixin(parameters, parameterKeys)
-                                            // for the following parameters we expect defaults
-                                           .withMandatoryProperty('changeManagement/changeDocumentLabel')
-                                           .withMandatoryProperty('changeManagement/clientOpts')
-                                           .withMandatoryProperty('changeManagement/credentialsId')
-                                           .withMandatoryProperty('changeManagement/git/from')
-                                           .withMandatoryProperty('changeManagement/git/to')
-                                           .withMandatoryProperty('changeManagement/git/format')
-                                           .withMandatoryProperty('failIfStatusIsNotInDevelopment')
-                                           // for the following parameters we expect a value provided from outside
-                                           .withMandatoryProperty('changeManagement/endpoint')
+            .loadStepDefaults(this)
+            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
+            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
+            .mixin(parameters, parameterKeys)
+            // for the following parameters we expect defaults
+            .withMandatoryProperty('changeManagement/changeDocumentLabel')
+            .withMandatoryProperty('changeManagement/clientOpts')
+            .withMandatoryProperty('changeManagement/credentialsId')
+            .withMandatoryProperty('changeManagement/git/from')
+            .withMandatoryProperty('changeManagement/git/to')
+            .withMandatoryProperty('changeManagement/git/format')
+            .withMandatoryProperty('failIfStatusIsNotInDevelopment')
+            // for the following parameters we expect a value provided from outside
+            .withMandatoryProperty('changeManagement/endpoint')
 
 
         Map configuration = configHelper.use()

diff --git a/vars/pipelineStashFilesAfterBuild.groovy b/vars/pipelineStashFilesAfterBuild.groovy
@@ -23,8 +23,8 @@ def call(Map parameters = [:]) {
         Map config = ConfigurationHelper
             .loadStepDefaults(this)
             .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
-            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixin([
                 runCheckmarx: (script.commonPipelineEnvironment.configuration?.steps?.executeCheckmarxScan?.checkmarxProject != null && script.commonPipelineEnvironment.configuration.steps.executeCheckmarxScan.checkmarxProject.length()>0)
             ])

diff --git a/vars/pipelineStashFilesBeforeBuild.groovy b/vars/pipelineStashFilesBeforeBuild.groovy
@@ -25,8 +25,8 @@ def call(Map parameters = [:]) {
         Map config = ConfigurationHelper
             .loadStepDefaults(this)
             .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
-            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixin(parameters, PARAMETER_KEYS)
             .use()
 

diff --git a/vars/snykExecute.groovy b/vars/snykExecute.groovy
@@ -27,8 +27,8 @@ def call(Map parameters = [:]) {
         Map config = ConfigurationHelper
             .loadStepDefaults(this)
             .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
-            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
             .mixin(parameters, PARAMETER_KEYS)
             // check mandatory paramerers
             .withMandatoryProperty('dockerImage')

diff --git a/vars/transportRequestCreate.groovy b/vars/transportRequestCreate.groovy
@@ -30,18 +30,18 @@ def call(parameters = [:]) {
         ChangeManagement cm = parameters.cmUtils ?: new ChangeManagement(script)
 
         ConfigurationHelper configHelper = ConfigurationHelper
-                                            .loadStepDefaults(this)
-                                            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
-                                            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
-                                            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
-                                            .mixin(parameters, parameterKeys)
-                                            .withMandatoryProperty('changeManagement/clientOpts')
-                                            .withMandatoryProperty('changeManagement/credentialsId')
-                                            .withMandatoryProperty('changeManagement/endpoint')
-                                            .withMandatoryProperty('changeManagement/git/from')
-                                            .withMandatoryProperty('changeManagement/git/to')
-                                            .withMandatoryProperty('changeManagement/git/format')
-                                            .withMandatoryProperty('developmentSystemId')
+            .loadStepDefaults(this)
+            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
+            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
+            .mixin(parameters, parameterKeys)
+            .withMandatoryProperty('changeManagement/clientOpts')
+            .withMandatoryProperty('changeManagement/credentialsId')
+            .withMandatoryProperty('changeManagement/endpoint')
+            .withMandatoryProperty('changeManagement/git/from')
+            .withMandatoryProperty('changeManagement/git/to')
+            .withMandatoryProperty('changeManagement/git/format')
+            .withMandatoryProperty('developmentSystemId')
 
         Map configuration =  configHelper.use()
 

diff --git a/vars/transportRequestRelease.groovy b/vars/transportRequestRelease.groovy
@@ -32,17 +32,17 @@ def call(parameters = [:]) {
         ChangeManagement cm = parameters.cmUtils ?: new ChangeManagement(script)
 
         ConfigurationHelper configHelper = ConfigurationHelper
-                            .loadStepDefaults(this)
-                            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
-                            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
-                            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
-                            .mixin(parameters, parameterKeys)
-                            .withMandatoryProperty('changeManagement/clientOpts')
-                            .withMandatoryProperty('changeManagement/credentialsId')
-                            .withMandatoryProperty('changeManagement/endpoint')
-                            .withMandatoryProperty('changeManagement/git/to')
-                            .withMandatoryProperty('changeManagement/git/from')
-                            .withMandatoryProperty('changeManagement/git/format')
+            .loadStepDefaults(this)
+            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
+            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
+            .mixin(parameters, parameterKeys)
+            .withMandatoryProperty('changeManagement/clientOpts')
+            .withMandatoryProperty('changeManagement/credentialsId')
+            .withMandatoryProperty('changeManagement/endpoint')
+            .withMandatoryProperty('changeManagement/git/to')
+            .withMandatoryProperty('changeManagement/git/from')
+            .withMandatoryProperty('changeManagement/git/format')
 
         Map configuration = configHelper.use()
 

diff --git a/vars/transportRequestUploadFile.groovy b/vars/transportRequestUploadFile.groovy
@@ -32,22 +32,22 @@ def call(parameters = [:]) {
 
         ChangeManagement cm = parameters.cmUtils ?: new ChangeManagement(script)
 
-        ConfigurationHelper configHelper =
-            ConfigurationHelper.loadStepDefaults(this)
-                               .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
-                               .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
-                               .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
-                               .mixin(parameters, parameterKeys)
-                               .addIfEmpty('filePath', script.commonPipelineEnvironment.getMtarFilePath())
-                               .withMandatoryProperty('applicationId')
-                               .withMandatoryProperty('changeManagement/changeDocumentLabel')
-                               .withMandatoryProperty('changeManagement/clientOpts')
-                               .withMandatoryProperty('changeManagement/credentialsId')
-                               .withMandatoryProperty('changeManagement/endpoint')
-                               .withMandatoryProperty('changeManagement/git/from')
-                               .withMandatoryProperty('changeManagement/git/to')
-                               .withMandatoryProperty('changeManagement/git/format')
-                               .withMandatoryProperty('filePath')
+        ConfigurationHelper configHelper = ConfigurationHelper
+            .loadStepDefaults(this)
+            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
+            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
+            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
+            .mixin(parameters, parameterKeys)
+            .addIfEmpty('filePath', script.commonPipelineEnvironment.getMtarFilePath())
+            .withMandatoryProperty('applicationId')
+            .withMandatoryProperty('changeManagement/changeDocumentLabel')
+            .withMandatoryProperty('changeManagement/clientOpts')
+            .withMandatoryProperty('changeManagement/credentialsId')
+            .withMandatoryProperty('changeManagement/endpoint')
+            .withMandatoryProperty('changeManagement/git/from')
+            .withMandatoryProperty('changeManagement/git/to')
+            .withMandatoryProperty('changeManagement/git/format')
+            .withMandatoryProperty('filePath')
 
         Map configuration = configHelper.use()