fix ordering issue

bundle install needs to be run before librarian puppet
can be used
This commit is contained in:
Dan Bode
2013-03-21 21:14:22 -07:00
committed by Dan Bode
parent f4c0459cd5
commit 24678b9d1d

View File

@@ -18,6 +18,12 @@
set -e
set -u
# install gem dependencies
mkdir .vendor
export GEM_HOME=`pwd`/.vendor
# install gem dependencies
bundle install
# install required modules
if [ $module_install_method = 'librarian' ]; then
bundle exec librarian-puppet install
@@ -29,13 +35,6 @@ elif [ $module_install_method = 'pmt' ]; then
git clone git://github.com/puppetlabs/puppetlabs-vcsrepo modules/vcsrepo
fi
# install gem dependencies
mkdir .vendor
export GEM_HOME=`pwd`/.vendor
# install gem dependencies
bundle install
# only build out integration test environment if we are not running unit tests
if [ ! $test_mode = 'unit' ]; then
# set operatingsystem to use for integration tests tests