commit 159cd84d9758df7b542843dd82aa3b0ee906b703
author chnyda <chnyda@mirantis.com> Mon May 15 17:36:15 2017 +0200
committer chnyda <chnyda@mirantis.com> Mon May 15 17:36:26 2017 +0200
tree c150ddc82f0c6dc78d8638fbcdefda632f680b2d
parent 446dd15d2ad3de17867cd5939c85e8cc5adb5dd4

Try to fix test-salt

Change-Id: Icc3c436bb73143a4bdcf20efb5079ebce48c0d8a

test-salt-models-pipeline.groovy

diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index 7d9c2d5..f7a6101 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -31,7 +31,7 @@
 
 def testMinion(minion)
 {
-  return sh(script: "reclass-salt -p ${minion}", returnStatus:true)
+  sh("service salt-master restart && service salt-minion restart && sleep 5 && bash -c 'source /srv/salt/scripts/salt-master-init.sh; cd /srv/salt/scripts && verify_salt_minion ${minion}'")
 }
 
 
@@ -48,20 +48,23 @@
 
         sh("mkdir -p /srv/salt/ || true")
         sh("cp -r ${workspace} /srv/salt/reclass")
-        sh("apt-get update && apt-get install -y curl subversion git python-pip sudo python-pip python-dev zlib1g-dev reclass git")
+        sh("apt-get update && apt-get install -y curl subversion git python-pip sudo python-pip python-dev zlib1g-dev git")
         sh("svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts")
         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'")
+        sh("pip install git+https://github.com/epcim/reclass.git@pr/fix/fix_raise_UndefinedVariableError")
         sh("ls -lRa /srv/salt/reclass")
 
         // setup iniot and verify salt master and minions
-        withEnv(["FORMULAS_SOURCE=pkg", "DEBUG=1", "MASTER_HOSTNAME=${master}", "MINION_ID=${master}", "HOSTNAME=cfg01","DOMAIN=mk-ci.local"]){
+        withEnv(["FORMULAS_SOURCE=pkg", "DEBUG=1", "MASTER_HOSTNAME=${master}", "MINION_ID=${master}", "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'")
             sh("bash -c 'source /srv/salt/scripts/salt-master-init.sh; cd /srv/salt/scripts && saltmaster_init'")
         }
 
+        sh("ls -lRa /srv/salt/reclass/classes/service/")
+
           def nodes
           if (DEFAULT_GIT_URL.contains("mk-ci")) {
             nodes = sh script: "find /srv/salt/reclass/nodes -name '*.yml' | grep -v 'cfg*.yml'", returnStdout: true
@@ -70,7 +73,9 @@
           }
           for (minion in nodes.tokenize()) {
             def basename = sh script: "basename ${minion} .yml", returnStdout: true
-            testMinion(basename.trim())
+            if (!basename.trim().contains(master)) {
+              testMinion(basename.trim())
+            }
           }
           
     }