commit 2d01c8439279d2c64c0e30930058ab51feb53f8a
author Jakub Josef <jakub.josef@gmail.com> Thu Aug 17 13:37:26 2017 +0200
committer Jakub Josef <jjosef@mirantis.com> Thu Aug 17 14:51:55 2017 +0000
tree 7c81541dd0f735eb8c48a9ac97e1253f42fea7bd
parent 53f10bbfd7699ccd1bd6d3c6860cfe9bcbcbe255

Added cluster name to model testing function

Change-Id: I15d1115f0723242d6d6eb8f7b40b5bf26bdf9a7d

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index d6a01d6..6f36dec 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -4,6 +4,7 @@
  * setup and test salt-master
  *
  * @param masterName          salt master's name
+ * @param clusterName         model cluster name
  * @param extraFormulas       extraFormulas to install
  * @param formulasSource      formulas source (git or pkg)
  * @param testDir             directory of model
@@ -11,7 +12,7 @@
  * @param formulasRevision    APT revision for formulas (optional default stable)
  */
 
-def setupAndTestNode(masterName, extraFormulas, testDir, formulasSource = 'pkg', formulasRevision = 'stable', dockerMaxCpus = 0) {
+def setupAndTestNode(masterName, clusterName, extraFormulas, testDir, formulasSource = 'pkg', formulasRevision = 'stable', dockerMaxCpus = 0) {
   def saltOpts = "--retcode-passthrough --force-color"
   def common = new com.mirantis.mk.Common()
   def workspace = common.getWorkspace()
@@ -53,7 +54,7 @@
     sh("git config --global user.name || git config --global user.name 'CI'")
     sh("git clone https://github.com/salt-formulas/salt-formulas-scripts /srv/salt/scripts")
 
-    withEnv(["FORMULAS_SOURCE=${formulasSource}", "EXTRA_FORMULAS=${extraFormulas}", "DISTRIB_REVISION=${formulasRevision}", "DEBUG=1", "MASTER_HOSTNAME=${masterName}", "MINION_ID=${masterName}", "HOSTNAME=cfg01", "DOMAIN=mk-ci.local"]){
+    withEnv(["FORMULAS_SOURCE=${formulasSource}", "EXTRA_FORMULAS=${extraFormulas}", "DISTRIB_REVISION=${formulasRevision}", "DEBUG=1", "MASTER_HOSTNAME=${masterName}", "CLUSTER_NAME=${clusterName}", "MINION_ID=${masterName}", "HOSTNAME=cfg01", "DOMAIN=mk-ci.local"]){
         sh("bash -c 'echo $MASTER_HOSTNAME'")
         sh("bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && source_local_envs && system_config_master'")
         sh("bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && source_local_envs && saltmaster_bootstrap'")