commit 321405aa9c1f97fd0316d91e7a2088f89f13e38a
author Dmitrii Kabanov <dkabanov@mirantis.com> Wed Aug 16 16:38:51 2017 -0700
committer Jakub Josef <jjosef@mirantis.com> Fri Aug 18 10:51:55 2017 +0000
tree 4f7ea32dc0d5f1df0b2e429e25c5df347d69d05d
parent e38aff42baa56a04b63f51c80c031bab8116c511

Improve cleanup function in validation pipeline

Change-Id: I8e85bfb145727fe852bf26171cd7db9ae549e417

src/com/mirantis/mcp/Validate.groovy

diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index 016d5eb..bd1661a 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -77,7 +77,9 @@
  */
 def runCleanup(master, target, output_dir) {
     def salt = new com.mirantis.mk.Salt()
-    salt.cmdRun(master, target, "docker rm -f qa_tools")
+    if ( salt.cmdRun(master, target, "docker ps -f name=qa_tools -q", false, null, false)['return'][0].values()[0] ) {
+        salt.cmdRun(master, target, "docker rm -f qa_tools")
+    }
     sh "rm -r ${output_dir}"
 }