commit 372c882a7687cbf45278c98cf9467e6732554eff
author Jakub Josef <jjosef@mirantis.com> Thu May 25 11:55:39 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Thu May 25 11:55:40 2017 +0000
tree f20844b726bd27e0e26b2005dde2167a67803f56
parent 66529aacea73478be1f2cd09809ee8edc2aef5df
parent aa86951369419a0b2bc37bc221f81dac6d2125ab

Merge "Use tcpcloud/salt-models-testing and remove debug prints"

test-salt-models-pipeline.groovy

diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index fad3d4e..0936113 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -111,21 +111,30 @@
 }
 
 def setupAndTestNode(masterName) {
-  def img = docker.image("ubuntu:latest")
   def saltOpts = "--retcode-passthrough --force-color"
   def common = new com.mirantis.mk.Common()
   def workspace = common.getWorkspace()
+  def imageFound = true
+  def img
+  try {
+    img = docker.image("tcpcloud/salt-models-testing")
+    img.pull()
+  } catch (Throwable e) {
+    img = docker.image("ubuntu:latest")
+    imageFound = false
+  }
 
   img.inside("-u root:root --hostname=${masterName}") {
     wrap([$class: 'AnsiColorBuildWrapper']) {
+      if (!imageFound) {
+        sh("apt-get update && apt-get install -y curl subversion git python-pip sudo python-pip python-dev zlib1g-dev git")
+        sh("pip install git+https://github.com/epcim/reclass.git@pr/fix/fix_raise_UndefinedVariableError")
+      }
       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 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", "EXTRA_FORMULAS=${EXTRA_FORMULAS}", "DEBUG=1", "MASTER_HOSTNAME=${masterName}", "MINION_ID=${masterName}", "HOSTNAME=cfg01", "DOMAIN=mk-ci.local"]){
@@ -134,7 +143,6 @@
           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")) {