commit e49257986f00ef3ddabf22fa4a4ced30ea9b266e
author chnyda <chnyda@mirantis.com> Tue Oct 31 14:21:29 2017 +0100
committer Cedric Hnyda <chnyda@mirantis.com> Tue Oct 31 13:25:51 2017 +0000
tree e3a7feb110c4313b8b44e4e898395b8be55e7ae6
parent bcb97e2e1b7e8e12c7089031a07cd083ba23f826

SaltModelTesting: change the way reclass is installed

Change-Id: I042993e4740aba36dbc0606857f8adba3e947d1c

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index f5048b4..7766e27 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -42,7 +42,6 @@
   img.inside("-u root:root --hostname=${masterName} --ulimit nofile=4096:8192 ${dockerMaxCpusOption}") {
     if (!imageFound) {
       sh("apt-get update && apt-get install -y curl git python-pip sudo python-pip python-dev zlib1g-dev git")
-      sh("pip install git+https://github.com/salt-formulas/reclass.git --upgrade")
     }
     sh("mkdir -p /srv/salt/scripts/ || true")
     sh("cp -r ${testDir} /srv/salt/reclass")
@@ -52,6 +51,7 @@
 
     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}" ]){
         sh("bash -c 'echo $MASTER_HOSTNAME'")
+        sh("bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && install_reclass'")
         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'")
         sh("bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && source_local_envs && saltmaster_init'")