commit 0a1fe026a3648ba9449941a97eb24e38876b6182
author chnyda <chnyda@mirantis.com> Fri Nov 10 15:18:42 2017 +0100
committer Cedric Hnyda <chnyda@mirantis.com> Mon Nov 13 08:51:34 2017 +0000
tree f24ede711ad795cff1da4e8d7b68eb8cbdf6804a
parent e0ed6cac5c468952923dd8e655127a7295580ec6

Refactor salt-models-testing to support image with pre-installed salt

Change-Id: I3b47b41c0ad3918abe30b6349c46cb98aede30ad

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index 8340592..824e1fa 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -25,7 +25,7 @@
   def imageFound = true
   def img
   try {
-    img = docker.image("tcpcloud/salt-models-testing")
+    img = docker.image("tcpcloud/salt-models-testing:${formulasRevision}")
     img.pull()
   } catch (Throwable e) {
     img = docker.image("ubuntu:latest")
@@ -53,9 +53,16 @@
     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}", "CLUSTER_NAME=${clusterName}", "MINION_ID=${masterName}", "HOSTNAME=cfg01", "DOMAIN=mk-ci.local", "RECLASS_IGNORE_CLASS_NOTFOUND=${ignoreClassNotfound}", "APT_REPOSITORY=${aptRepoUrl}", "APT_REPOSITORY_GPG=${aptRepoGPG}"]){
-        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'")
+        if (!imageFound) {
+          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'")
+        } else {
+          sh("cp -r ${testDir}/* /srv/salt/reclass && echo '127.0.1.2  salt' >> /etc/hosts")
+          sh("service salt-master restart && service salt-minion restart && sleep 2")
+          sh("bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && source_local_envs && configure_salt_master && configure_salt_minion'")
+          sh("service salt-master restart && service salt-minion restart && sleep 2")
+        }
+
         sh("bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && source_local_envs && saltmaster_init'")
 
         if (!legacyTestingMode) {