Small fixes: [1] Script name changed; [2] CVP sanity run command changed
Change-Id: I45f12e324c80eae24930668c325e627259c27415
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index 00534d9..d919379 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -155,7 +155,7 @@
}
}
def script = ". ${env.WORKSPACE}/venv/bin/activate; ${settings}" +
- "pytest --junitxml ${output_dir}cvp_sanity.xml -sv ${env.WORKSPACE}/cvp-sanity-checks/cvp_checks/tests/${test_set}"
+ "pytest --junitxml ${output_dir}cvp_sanity.xml --tb=short -sv ${env.WORKSPACE}/cvp-sanity-checks/cvp_checks/tests/${test_set}"
withEnv(["SALT_USERNAME=${username}", "SALT_PASSWORD=${password}", "SALT_URL=${salt_url}"]) {
def statusCode = sh script:script, returnStatus:true
}
@@ -548,7 +548,7 @@
*
* @param target Host with cvp container
*/
-def openstack_cleanup(master, target, script_path="/home/rally/cvp-configuration/clean.sh") {
+def openstack_cleanup(master, target, script_path="/home/rally/cvp-configuration/cleanup.sh") {
def salt = new com.mirantis.mk.Salt()
salt.runSaltProcessStep(master, "${target}", 'cmd.run', ["docker exec cvp bash -c ${script_path}"])
}