commit c0758f3de070a4f54c805e489d7bf9c7282b2a84
author Mykyta Karpin <mkarpin@mirantis.com> Fri Jun 23 18:10:24 2017 +0300
committer Mykyta Karpin <mkarpin@mirantis.com> Fri Jun 23 18:11:15 2017 +0300
tree 9eb444c6693a5372e0c13ac564ae4c343aa8690c
parent 4df0c1f69b2e016eedcd8d2a847aaeb855772f1b

Add possibility to set formula source

Change-Id: Icec589d97607a44835503444a5ddd83da4e8682e

test-salt-model-node.groovy

diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index 53f5e75..117971b 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -8,6 +8,7 @@
  *  NODE_TARGET
  *  SYSTEM_GIT_URL
  *  SYSTEM_GIT_REF
+ *  FORMULAS_SOURCE
  */
 
 def common = new com.mirantis.mk.Common()
@@ -51,7 +52,7 @@
     stage("test node") {
       if (checkouted) {
         def workspace = common.getWorkspace()
-        saltModelTesting.setupAndTestNode(NODE_TARGET, EXTRA_FORMULAS, workspace)
+        saltModelTesting.setupAndTestNode(NODE_TARGET, EXTRA_FORMULAS, workspace, FORMULAS_SOURCE)
       }
     }
   } catch (Throwable e) {

test-salt-models-pipeline.groovy

diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index f2a38f9..b2123c5 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -21,6 +21,13 @@
   gerritRef = null
 }
 
+def formulasSource
+try {
+  formulasSource = FORMULAS_SOURCE
+} catch (MissingPropertyException e) {
+  formulasSource = "pkg"
+}
+
 def defaultGitRef, defaultGitUrl
 try {
     defaultGitRef = DEFAULT_GIT_REF
@@ -87,6 +94,7 @@
                 [$class: 'StringParameterValue', name: 'DEFAULT_GIT_REF', value: defaultGitRef],
                 [$class: 'StringParameterValue', name: 'NODE_TARGET', value: testTarget],
                 [$class: 'StringParameterValue', name: 'EXTRA_FORMULAS', value: EXTRA_FORMULAS],
+                [$class: 'StringParameterValue', name: 'FORMULAS_SOURCE', value: formulasSource],
                 [$class: 'StringParameterValue', name: 'CREDENTIALS_ID', value: CREDENTIALS_ID],
                 [$class: 'StringParameterValue', name: 'SYSTEM_GIT_URL', value: SYSTEM_GIT_URL],
                 [$class: 'StringParameterValue', name: 'SYSTEM_GIT_REF', value: SYSTEM_GIT_REF]