Fixes bundler working directory path

This prevents to create .gem/ directories inside each Puppet modules and
really stores all gems in .bundled/ directory.
The plugin building fails when .gem/ directories are present.

Change-Id: I65847de308bd11e71a1710c1ffc41ea766fdbdc1
This commit is contained in:
Swann Croiset 2015-09-23 11:14:10 +02:00
parent 02d2860b04
commit a5138a36a2
4 changed files with 11 additions and 9 deletions

View File

@ -1 +1,2 @@
Gemfile.lock
.bundle

View File

@ -1,3 +1,4 @@
spec/fixtures/modules/*
spec/fixtures/manifests/*
Gemfile.lock
.bundle

View File

@ -2,3 +2,4 @@ spec/fixtures/modules/*
spec/fixtures/manifests/*
Gemfile.lock
tests/lua/mocks/date_time.lua
.bundle

17
tox.ini
View File

@ -11,11 +11,9 @@ changedir = {toxinidir}/deployment_scripts/puppet/manifests
whitelist_externals =
bundle
mkdir
setenv =
GEM_HOME={toxinidir}/.bundled_gems
commands =
mkdir -p {toxinidir}/.bundled_gems
bundle install
bundle install --path {toxinidir}/.bundled_gems
bundle exec rake test
[testenv:heka]
@ -24,11 +22,9 @@ changedir = {toxinidir}/deployment_scripts/puppet/modules/{envname}
whitelist_externals =
bundle
mkdir
setenv =
GEM_HOME={toxinidir}/.bundled_gems
commands =
mkdir -p {toxinidir}/.bundled_gems
bundle install
bundle install --path {toxinidir}/.bundled_gems
bundle exec rake test
[testenv:lma_collector]
@ -37,11 +33,9 @@ changedir = {toxinidir}/deployment_scripts/puppet/modules/{envname}
whitelist_externals =
bundle
mkdir
setenv =
GEM_HOME={toxinidir}/.bundled_gems
commands =
mkdir -p {toxinidir}/.bundled_gems
bundle install
bundle install --path {toxinidir}/.bundled_gems
bundle exec rake test
[testenv:docs]
@ -51,8 +45,13 @@ commands =
make clean html SPHINXOPTS=-W
[testenv:build_plugin]
changedir = {toxinidir}
whitelist_externals =
fpb
rm
commands =
rm -rf .build
rm -rf repositories/ubuntu/*.deb
rm -rf repositories/centos/*.rpm
fpb --check {toxinidir} --debug
fpb --build {toxinidir} --debug