commit 0cfaf7b2fec8e03cab9bdeab19f560801646e16e
author chnyda <chnyda@mirantis.com> Tue Aug 29 10:35:28 2017 +0200
committer Cedric Hnyda <chnyda@mirantis.com> Tue Aug 29 08:47:34 2017 +0000
tree 3356d5609a4c95b766f5431a44e3a91941874697
parent ddce0aa450da8936710a30d385538efaffeb8904

Test workflow_definition before generating model

Change-Id: I9ce904fcb52e7cfd6753b3aec26d14bdfeffd76f

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index d8bee44..e59f0ce 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -82,7 +82,6 @@
     def templateContext = readYaml text: content
     def clusterName = templateContext.default_context.cluster_name
     def clusterDomain = templateContext.default_context.cluster_domain
-    sh "python ${env.WORKSPACE}/workflow_definition_test.py"
     git.checkoutGitRepository("${testEnv}/classes/system", RECLASS_MODEL_URL, RECLASS_MODEL_BRANCH, CREDENTIALS_ID)
     saltModelTesting.setupAndTestNode("cfg01.${clusterDomain}", clusterName, EXTRA_FORMULAS, testEnv)
 }
@@ -124,6 +123,10 @@
             python.setupCookiecutterVirtualenv(cutterEnv)
         }
 
+        stage("Check workflow_definition") {
+            sh "python ${env.WORKSPACE}/workflow_definition_test.py"
+        }
+
         def contextFiles
         dir("${templateEnv}/contexts") {
             contextFiles = findFiles(glob: "*.yml")