Use cmdRun method to run docker in tempest tests
This method allows to get more detailed output
and check salt command result.
Change-Id: I7ecc4e919385380a4fe815e4da52752d6990bc39
diff --git a/src/com/mirantis/mk/Test.groovy b/src/com/mirantis/mk/Test.groovy
index 15fd18e..d6f37ee 100644
--- a/src/com/mirantis/mk/Test.groovy
+++ b/src/com/mirantis/mk/Test.groovy
@@ -50,20 +50,20 @@
def runTempestTests(master, dockerImageLink, target, pattern = "false") {
def salt = new com.mirantis.mk.Salt()
if (pattern == "false") {
- salt.runSaltProcessStep(master, "${target}", 'cmd.run', ["docker run --rm --net=host " +
- "-e TEMPEST_CONF=mcp.conf " +
- "-e SKIP_LIST=mcp_skip.list " +
- "-e SOURCE_FILE=keystonercv3 " +
- "-v /root/:/home/rally ${dockerImageLink} >> docker-tempest.log"])
- }
+ salt.cmdRun(master, "${target}", "docker run --rm --net=host " +
+ "-e TEMPEST_CONF=mcp.conf " +
+ "-e SKIP_LIST=mcp_skip.list " +
+ "-e SOURCE_FILE=keystonercv3 " +
+ "-v /root/:/home/rally ${dockerImageLink} >> docker-tempest.log")
+ }
else {
- salt.runSaltProcessStep(master, "${target}", 'cmd.run', ["docker run --rm --net=host " +
- "-e TEMPEST_CONF=mcp.conf " +
- "-e SKIP_LIST=mcp_skip.list " +
- "-e SOURCE_FILE=keystonercv3 " +
- "-e CUSTOM='--pattern ${pattern}' " +
- "-v /root/:/home/rally ${dockerImageLink} >> docker-tempest.log"])
- }
+ salt.cmdRun(master, "${target}", "docker run --rm --net=host " +
+ "-e TEMPEST_CONF=mcp.conf " +
+ "-e SKIP_LIST=mcp_skip.list " +
+ "-e SOURCE_FILE=keystonercv3 " +
+ "-e CUSTOM='--pattern ${pattern}' " +
+ "-v /root/:/home/rally ${dockerImageLink} >> docker-tempest.log")
+ }
}
/**