commit 8f37b6473d28a85b45ea2686a4ca3e8a356182d9
author Richard Felkl <rfelkl@mirantis.com> Thu Jun 21 13:52:07 2018 +0000
committer Gerrit Code Review <gerrit2@99e8dbefe3b7> Thu Jun 21 13:52:07 2018 +0000
tree 191705f6dd55d780c9f44dfebbc67963b157ef53
parent b077775b50daa9e784f3c7ef6c79d818937c523a
parent e711ebb9d906d6dbef673408e7c1379a2ab08882

Merge "Add a possibility to specify branches for cvp repos"

src/com/mirantis/mcp/Validate.groovy

diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index 761e085..02030e0 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -664,6 +664,11 @@
 def prepareVenv(repo_url, proxy) {
     def python = new com.mirantis.mk.Python()
     repo_name = "${repo_url}".tokenize("/").last()
+    if (repo_url.tokenize().size() > 1){
+        if (repo_url.tokenize()[1] == '-b'){
+            repo_name = repo_url.tokenize()[0].tokenize("/").last()
+        }
+    }
     sh "rm -rf ${repo_name}"
     withEnv(["HTTPS_PROXY=${proxy}", "HTTP_PROXY=${proxy}", "https_proxy=${proxy}", "http_proxy=${proxy}"]) {
         sh "git clone ${repo_url}"