Hide password from cvp-finc tests output
Related-prod: PROD-22774
Change-Id: Iecf903046a487b1c1d2c95e071b86aa627b3d004
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index 9ac618d..dd53450 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -39,11 +39,12 @@
* @param env_var Environment variables to set in container
* @param entrypoint Set entrypoint to /bin/bash or leave default
* @param mounts Map with mounts for container
+ * @param output_replacing Maps with regex with should be hide from output (passwords, etc)
**/
def runContainer(Map params){
def common = new com.mirantis.mk.Common()
- defaults = ["name": "cvp", "env_var": [], "entrypoint": true]
+ defaults = ["name": "cvp", "env_var": [], "entrypoint": true, "mounts": [:], "output_replacing": []]
params = defaults + params
def salt = new com.mirantis.mk.Salt()
def variables = ''
@@ -69,8 +70,11 @@
params.mounts.each { local, container ->
mounts = mounts + " -v ${local}:${container}"
}
- salt.cmdRun(params.master, params.target, "docker run -tid --net=host --name=${params.name}" +
- "${mounts} -u root ${entry_point} ${variables} ${params.dockerImageLink}")
+ salt.cmdRun(params.master, params.target,
+ "docker run -tid --net=host --name=${params.name}" +
+ "${mounts} -u root ${entry_point} ${variables} ${params.dockerImageLink}",
+ true, null, true, [],
+ params.output_replacing)
}
def runContainer(master, target, dockerImageLink, name='cvp', env_var=[], entrypoint=true, mounts=[:]){