[CVP] Fixed cleaning up stopped cvp containers
If the container was stopped manually, then 'docker ps -f' won't be
able to detect it and the new one won't be able to start
Related-PROD: PROD-36695
Change-Id: Ia2a27ff36fe4697b09951aec04443438b71271cd
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index 308ff14..263a933 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -59,7 +59,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) {
@@ -925,7 +925,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}")
}
}