commit 1628774db838f8494ba95f544a59c58bb91aba05
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Apr 16 14:35:09 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Apr 16 14:35:09 2019 +0000
tree 429d8d4a4ace574c2305f64b4e720fa64f96028e
parent e8115c4e0aca875b7009d582ae1daa8322b26293
parent 26d2cc11184a5cac815f3af229e863a2ae5549a8

Merge "Return git clone step for ruby-build to ensureRubyEnv function"

src/com/mirantis/mk/Ruby.groovy

diff --git a/src/com/mirantis/mk/Ruby.groovy b/src/com/mirantis/mk/Ruby.groovy
index 7802a11..8fac324 100644
--- a/src/com/mirantis/mk/Ruby.groovy
+++ b/src/com/mirantis/mk/Ruby.groovy
@@ -9,13 +9,12 @@
  * @param rubyVersion target ruby version (optional, default 2.2.3)
  */
 def ensureRubyEnv(rubyVersion="2.4.1"){
-    def ruby_build_root = "${env.WORKSPACE}/.rbenv/plugins/ruby-build"
     if (!fileExists("/var/lib/jenkins/.rbenv/versions/${rubyVersion}/bin/ruby")){
         //XXX: patch ruby-build because debian package is quite old
+        sh "git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build || git -C ~/.rbenv/plugins/ruby-build pull"
         sh "rbenv install ${rubyVersion} -sv";
     }
     sh "rbenv local ${rubyVersion};rbenv exec gem update --system"
-    sh "rm -rf ${ruby_build_root}"
 }
 
 /**