commit 85f72e6cffe1a14f46753ef89e6ab3583a92626b
author chnyda <chnyda@mirantis.com> Fri May 26 15:43:27 2017 +0200
committer chnyda <chnyda@mirantis.com> Fri May 26 15:43:27 2017 +0200
tree b93e419c136026e550361f06e28025d9ed322dbf
parent f4e5eb4e096da340e75229a1e5a2889632647f03

Fix salt-models testing library

Change-Id: I794bb2581e181afd29fa155559ba36acb4fca89a

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index 4e7f58d..4e28051 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -4,10 +4,11 @@
  * setup and test salt-master
  *
  * @param masterName          salt master's name
+ * @param extraFormulas       extraFormulas to install
  * @param testDir             directory of model
  */
 
-def setupAndTestNode(masterName, testDir="") {
+def setupAndTestNode(masterName, extraFormulas, testDir) {
   def saltOpts = "--retcode-passthrough --force-color"
   def common = new com.mirantis.mk.Common()
   def workspace = common.getWorkspace()
@@ -33,7 +34,7 @@
       sh("git config --global user.email || git config --global user.email 'ci@ci.local'")
       sh("git config --global user.name || git config --global user.name 'CI'")
 
-      withEnv(["FORMULAS_SOURCE=pkg", "DEBUG=1", "MASTER_HOSTNAME=${masterName}", "MINION_ID=${masterName}", "HOSTNAME=cfg01", "DOMAIN=mk-ci.local"]){
+      withEnv(["FORMULAS_SOURCE=pkg", "EXTRA_FORMULAS=${extraFormulas}}", "DEBUG=1", "MASTER_HOSTNAME=${masterName}", "MINION_ID=${masterName}", "HOSTNAME=cfg01", "DOMAIN=mk-ci.local"]){
           sh("bash -c 'echo $MASTER_HOSTNAME'")
           sh("bash -c 'source /srv/salt/scripts/salt-master-init.sh; cd /srv/salt/scripts && system_config'")
           sh("bash -c 'source /srv/salt/scripts/salt-master-init.sh; cd /srv/salt/scripts && saltmaster_bootstrap'")