commit 7dabb7ce502cbd2b590ef86b33955bd460aff34a
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Mar 07 09:34:51 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Mar 07 09:34:51 2019 +0000
tree 520f755d09c3374191b1e01dadb469a479558b83
parent 306272ff9730a2d25370dc274699e6833ad5d75d
parent e0e009e8c41e20b0f824cbd0ff13a69f98d870dd

Merge "Fix rbenv behavior for multiple ruby versions"

src/com/mirantis/mk/Ruby.groovy

diff --git a/src/com/mirantis/mk/Ruby.groovy b/src/com/mirantis/mk/Ruby.groovy
index dc08ce5..32b595e 100644
--- a/src/com/mirantis/mk/Ruby.groovy
+++ b/src/com/mirantis/mk/Ruby.groovy
@@ -9,9 +9,17 @@
  * @param rubyVersion target ruby version (optional, default 2.2.3)
  */
 def ensureRubyEnv(rubyVersion="2.4.1"){
-    if(!fileExists("/var/lib/jenkins/.rbenv/versions/${rubyVersion}/bin/ruby")){
+    def ruby_build_root = "~/.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"
+        // Check if git repo exists
+        if (!fileExists("${ruby_build_root}/.git")) {
+            sh "git clone https://github.com/rbenv/ruby-build.git ${ruby_build_root}"
+        } else {
+            // Ensure the repo is up-to-date
+            sh "cd ${ruby_build_root}"
+            sh "git pull"
+        }
         sh "rbenv install ${rubyVersion}";
     }
     sh "rbenv local ${rubyVersion};rbenv exec gem update --system"