opendev/system-config
Code Issues Proposed changes

Merge "Fix Berkshelf 3.x GeCode 3.x dependency"

Browse Source
This commit is contained in:
Jenkins 2014-09-03 21:53:10 +00:00 committed by Gerrit Code Review
commit e8cab3d878
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,8 +127,16 @@
name: chef-bundler-prep name: chef-bundler-prep
builders: builders:
- shell: | - shell: |
#!/bin/bash -x
mkdir -p .bundle mkdir -p .bundle
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
USE_SYSTEM_GECODE=1 bundle install --path=.bundle --jobs 1 --retry 3 --verbose
else
bundle install --path=.bundle --jobs 1 --retry 3 --verbose bundle install --path=.bundle --jobs 1 --retry 3 --verbose
fi
- builder: - builder:
name: chef-berkshelf-prep name: chef-berkshelf-prep

3
modules/openstack_project/files/zuul/layout.yaml
View File

@ -445,6 +445,9 @@ jobs:
# We're planning on Puppet 2.7 support to Spring 2015. # We're planning on Puppet 2.7 support to Spring 2015.
- name: ^.*puppet-unit-2.7$ - name: ^.*puppet-unit-2.7$
parameter-function: set_node_options_default_precise parameter-function: set_node_options_default_precise
# Berkshelf 3.x requires GeCode 3.x on precise.
- name: ^gate-.*-chef-(lint|style|unit)$
parameter-function: set_node_options_default_precise
# tempest and d-g branchless tests need to only run on master # tempest and d-g branchless tests need to only run on master
# (needs to be early to not impact non-voting stanzas later) # (needs to be early to not impact non-voting stanzas later)
- name: ^(?!periodic-).*(-icehouse|-havana)$ - name: ^(?!periodic-).*(-icehouse|-havana)$