Skip to content
Snippets Groups Projects
Unverified Commit d9b4054b authored by sanfrancrisko's avatar sanfrancrisko Committed by GitHub
Browse files

Merge pull request #366 from puppetlabs/adrianiurca-allow-use-dist-locally

Allow to use a different dist per collection
parents abf5b35c b65afe6a
No related branches found
No related tags found
No related merge requests found
...@@ -129,6 +129,9 @@ jobs: ...@@ -129,6 +129,9 @@ jobs:
- "bundle exec rake 'litmus:install_agent[<%=puppet_version%>]'" - "bundle exec rake 'litmus:install_agent[<%=puppet_version%>]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
<% if config['collection']['dist']-%>
dist: <%=config['collection']['dist']%>
<% end -%>
env: PLATFORMS=<%=platform%>_<%=puppet_version%> env: PLATFORMS=<%=platform%>_<%=puppet_version%>
rvm: <%=@configs['litmus']['rvm']%> rvm: <%=@configs['litmus']['rvm']%>
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment