Change TOOLS_REPO parameter handling
Change-Id: Ic591281e62d7d2a4f4b38c817da054aa2a8e285c
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index 761e085..e1cf238 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -469,15 +469,21 @@
conf_script_path="", ext_variables = []) {
def salt = new com.mirantis.mk.Salt()
if (testing_tools_repo != "" ) {
- 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 = conf_script_path != "" ? conf_script_path : "/opt/devops-qa-tools/deployment/configure.sh"
+ 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
+ }
+ 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}")
}
- 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}")
+ else {
+ common.infoMsg("TOOLS_REPO is empty, no confguration is needed for container")
+ }
}
/**