From 25a4c5d4072913c4fa524d70e3114dd4451d712f Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Tue, 9 Sep 2014 09:53:10 -0500 Subject: [PATCH] Fix ruby-191-prep to install bundler Still trying to get ruby 1.9.x as default for gate jobs on precise. * install the bundler gem under 1.9.x * make sure do to update before trying to install libgecode-dev Change-Id: I61df9fd3a94670bb10bac8bb4d820a66f25d7675 Closes-Bug: #1357439 --- .../files/jenkins_job_builder/config/macros.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index 0d925ae548..62b62a894f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -128,11 +128,12 @@ builders: - shell: | #!/bin/bash -x + # Set 1.9.1 ruby and gem as default sudo update-alternatives --install /usr/bin/ruby ruby /usr/bin/ruby1.9.1 20 sudo update-alternatives --set ruby /usr/bin/ruby1.9.1 sudo update-alternatives --install /usr/bin/gem gem /usr/bin/gem1.9.1 10 sudo update-alternatives --set gem /usr/bin/gem1.9.1 - sudo gem update --no-rdoc --no-ri + gem install bundler --no-rdoc --no-ri --verbose - builder: name: chef-bundler-prep @@ -143,7 +144,8 @@ grep -E .*berkshelf.*3\.\d*\.\d*.* Gemfile if [ $? -eq 0 ]; then # For Berkshelf 3.x use the system gecode 3.x libraries - sudo apt-get install -y libgecode-dev + sudo apt-get update + sudo apt-get install -y libgecode-dev libxml2-dev libxml2 libxslt-dev build-essential USE_SYSTEM_GECODE=1 bundle install --path=.bundle --jobs 1 --retry 3 --verbose else bundle install --path=.bundle --jobs 1 --retry 3 --verbose