Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
c523e01 [CVP] Fixed cleaning up stopped cvp containers
Change-Id: I1d4b2a4547bbf4668a9e7bcb808768524f0ab0e0
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index f9a6628..c36087f 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -57,7 +57,7 @@
"/root/test/": "/root/tempest/",
"/etc/hosts": "/etc/hosts"]
params.mounts = default_mounts + params.mounts
- if ( salt.cmdRun(params.master, params.target, "docker ps -f name=^${params.name}\$ -q", false, null, false)['return'][0].values()[0] ) {
+ if ( salt.cmdRun(params.master, params.target, "docker ps -a -f name=^${params.name}\$ -q", false, null, false)['return'][0].values()[0] ) {
salt.cmdRun(params.master, params.target, "docker rm -f ${params.name}")
}
if (params.env_var.size() > 0) {
@@ -868,7 +868,7 @@
*/
def runCleanup(master, target, name='cvp') {
def salt = new com.mirantis.mk.Salt()
- if ( salt.cmdRun(master, target, "docker ps -f name=^${name}\$ -q", false, null, false)['return'][0].values()[0] ) {
+ if ( salt.cmdRun(master, target, "docker ps -a -f name=^${name}\$ -q", false, null, false)['return'][0].values()[0] ) {
salt.cmdRun(master, target, "docker rm -f ${name}")
}
}