Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addition of global_env section alongside configuration and docs update #82

Merged
merged 3 commits into from
May 16, 2018

Conversation

HelenCampbell
Copy link
Contributor

@HelenCampbell HelenCampbell commented May 11, 2018

Updates the global configuration to use the beaker_puppet_collection to ensure we are testing on Puppet 5, also updated to the correct the puppet 4 run, in conjunction with the changes jearls introduced.

174 --- .travis.yml 2018-05-10 15:12:25.076285955 +0100
175 +++ .travis.yml.pdknew  2018-05-11 13:17:50.767612000 +0100
176 @@ -16,7 +16,9 @@
177  rvm:
178    - 2.4.1
179  env:
180 -  - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
181 +  global:
182 +    - BEAKER_PUPPET_COLLECTION=puppet5
183 +    - PARALLEL_TEST_PROCESSORS=16
184  matrix:
185    fast_finish: true
186    include:
187 @@ -47,7 +49,7 @@
188      -
189        env: CHECK=spec
190      -
191 -      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
192 +      env: BEAKER_PUPPET_COLLECTION=pc1 CHECK=spec
193        rvm: 2.1.9
194  branches:
195    only:

Allow configuration of Travis `global` environment variables through
the addition of a new `global_env` section in the travis configuration.
See https://docs.travis-ci.com/user/environment-variables/#Global-Variables
@HelenCampbell HelenCampbell changed the title Addition of global_env section alongside configuration and docs update (WIP) Addition of global_env section alongside configuration and docs update May 11, 2018
@HelenCampbell
Copy link
Contributor Author

HelenCampbell commented May 14, 2018

puppetlabs/puppetlabs-apache#1785 - Example PR

@HelenCampbell HelenCampbell changed the title (WIP) Addition of global_env section alongside configuration and docs update Addition of global_env section alongside configuration and docs update May 16, 2018
@david22swan david22swan merged commit fe44b98 into puppetlabs:master May 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants