opendev/system-config
Code Issues Proposed changes

Fix ruby-191-prep to install bundler

Browse Source 
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
This commit is contained in:
Mark Vanderwiel 2014-09-09 09:53:10 -05:00
parent be90bc1c50
commit 25a4c5d407
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
View File

@ -128,11 +128,12 @@
builders: builders:
- shell: | - shell: |
#!/bin/bash -x #!/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 --install /usr/bin/ruby ruby /usr/bin/ruby1.9.1 20
sudo update-alternatives --set ruby /usr/bin/ruby1.9.1 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 --install /usr/bin/gem gem /usr/bin/gem1.9.1 10
sudo update-alternatives --set gem /usr/bin/gem1.9.1 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: - builder:
name: chef-bundler-prep name: chef-bundler-prep
@ -143,7 +144,8 @@
grep -E .*berkshelf.*3\.\d*\.\d*.* Gemfile grep -E .*berkshelf.*3\.\d*\.\d*.* Gemfile
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
# For Berkshelf 3.x use the system gecode 3.x libraries # 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 USE_SYSTEM_GECODE=1 bundle install --path=.bundle --jobs 1 --retry 3 --verbose
else else
bundle install --path=.bundle --jobs 1 --retry 3 --verbose bundle install --path=.bundle --jobs 1 --retry 3 --verbose