Merge "Fix tests when executed by Jenkins slaves"

2015-09-07 07:46:04 +00:00 · 2015-09-07 07:46:04 +00:00 · 52082618d3
commit 52082618d3
parent 4bfeded1fd cf79f9d324
2 changed files with 13 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.bundled_gems/
--- a/tox.ini
+++ b/tox.ini
@ -5,15 +5,25 @@ skipsdist = True
 [testenv:heka]
 deps =
 changedir = {toxinidir}/deployment_scripts/puppet/modules/{envname}
-whitelist_externals = bundle
+whitelist_externals =
+    bundle
+    mkdir
+setenv =
+    GEM_HOME={toxinidir}/.bundled_gems
 commands =
+    mkdir -p {toxinidir}/.bundled_gems
    bundle install
    bundle exec rake test

 [testenv:lma_collector]
 deps =
 changedir = {toxinidir}/deployment_scripts/puppet/modules/{envname}
-whitelist_externals = bundle
+whitelist_externals =
+    bundle
+    mkdir
+setenv =
+    GEM_HOME={toxinidir}/.bundled_gems
 commands =
+    mkdir -p {toxinidir}/.bundled_gems
    bundle install
    bundle exec rake test