[CVP] Fixes for TOOLS_REPO parameter for cvp-func/perf/ha job
Change-Id: Ib9800fb1c0b3c2c05222e22117a53688da8a73d6
Related-PROD: PROD-30325
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index f4ad5bc..5f282a5 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -713,21 +713,24 @@
tempest_endpoint_type="internalURL", tempest_version="",
conf_script_path="", ext_variables = []) {
def salt = new com.mirantis.mk.Salt()
+ def common = new com.mirantis.mk.Common()
if (testing_tools_repo != "" ) {
+ workdir = ''
if (testing_tools_repo.contains('http://') || testing_tools_repo.contains('https://')) {
salt.cmdRun(master, target, "docker exec cvp git clone ${testing_tools_repo} cvp-configuration")
configure_script = conf_script_path != "" ? conf_script_path : "cvp-configuration/configure.sh"
}
else {
configure_script = testing_tools_repo
+ workdir = ' -w /var/lib/'
}
ext_variables.addAll("PROXY=${proxy}", "TEMPEST_REPO=${tempest_repo}",
"TEMPEST_ENDPOINT_TYPE=${tempest_endpoint_type}",
"tempest_version=${tempest_version}")
- salt.cmdRun(master, target, "docker exec -e " + ext_variables.join(' -e ') + " cvp bash -c ${configure_script}")
+ salt.cmdRun(master, target, "docker exec -e " + ext_variables.join(' -e ') + " ${workdir} cvp bash -c ${configure_script}")
}
else {
- common.infoMsg("TOOLS_REPO is empty, no confguration is needed for container")
+ common.infoMsg("TOOLS_REPO is empty, no configuration is needed for this container")
}
}