commit 81cd2f04d4f66d3fe84f70210daf27309f9b706c
author Jakub Josef <jjosef@mirantis.com> Fri Jan 12 11:40:04 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Fri Jan 12 11:40:04 2018 +0000
tree 73260ba12c2a95293936c6c896d1884b55f55c48
parent 3a2e0350c8f2c894b9fa6fe9221c0ff1c2b0cd18
parent 69c802d8d1b1000613326d60308cfdbe026020e6

Merge "Generate Cookiecutter products - fixed aptly_server_address"

test-salt-formulas-pipeline.groovy

diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index fe7809c..37983c0 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -97,8 +97,14 @@
     }
     stage("test") {
       if (checkouted) {
-        sh("make clean")
-        sh("[ $SALT_VERSION != 'latest' ] || export SALT_VERSION=''; make test")
+        try {
+          saltVersion = SALT_VERSION
+        } catch (MissingPropertyException e) {
+          saltVersion = "latest"
+        }
+        withEnv(["SALT_VERSION=${saltVersion}"]) {
+          sh("make clean && make test")
+        }
       }
     }
     stage("kitchen") {
@@ -150,4 +156,4 @@
     }
     common.sendNotification(currentBuild.result, "", ["slack"])
   }
-}
\ No newline at end of file
+}