Merge pull request #249 from SAP/cfStashingFix

cloudFoundryDeploy - update stashing behavior

resources/default_pipeline_environment.yml

@@ -111,7 +111,9 @@ steps:
     mtaPath: ''
     smokeTestScript: 'blueGreenCheckScript.sh'
     smokeTestStatusCode: 200
-    stashContent: []
+    stashContent:
+      - 'deployDescriptor'
+      - 'pipelineConfigAndTests'
     cf_native:
       dockerImage: 's4sdk/docker-cf-cli'
       dockerWorkspace: '/home/piper'

vars/cloudFoundryDeploy.groovy

@@ -50,7 +50,7 @@ def call(Map parameters = [:]) {
 
         echo "[${STEP_NAME}] General parameters: deployTool=${config.deployTool}, deployType=${config.deployType}, cfApiEndpoint=${config.cloudFoundry.apiEndpoint}, cfOrg=${config.cloudFoundry.org}, cfSpace=${config.cloudFoundry.space}, cfCredentialsId=${config.cloudFoundry.credentialsId}, deployUser=${config.deployUser}"
 
-        utils.unstash 'deployDescriptor'
+        config.stashContent = utils.unstashAll(config.stashContent)
 
         if (config.deployTool == 'mtaDeployPlugin') {
             // set default mtar path
@@ -69,9 +69,8 @@ def call(Map parameters = [:]) {
 
             if (config.smokeTestScript == 'blueGreenCheckScript.sh') {
                 writeFile file: config.smokeTestScript, text: libraryResource(config.smokeTestScript)
-            } else {
-                utils.unstash 'pipelineConfigAndTests'
             }
+
             config.smokeTest = '--smoke-test $(pwd)/' + config.smokeTestScript
             sh "chmod +x ${config.smokeTestScript}"