(FM-4049) Update to current msync configs [2c99161]

This commit is contained in:
David Schmitt 2016-01-25 14:19:19 +00:00
parent 2a510169d6
commit 7ff944daa0
4 changed files with 18 additions and 24 deletions

20
.gitignore vendored
View file

@ -1,12 +1,10 @@
/pkg/ pkg/
/Gemfile.lock Gemfile.lock
/vendor/ vendor/
/spec/fixtures/manifests/* spec/fixtures/
/spec/fixtures/modules/* .vagrant/
!/spec/fixtures/modules/stdlib .bundle/
!/spec/fixtures/modules/stdlib/* coverage/
/.vagrant/ log/
/.bundle/ .idea/
/coverage/
/.idea/
*.iml *.iml

4
.rspec
View file

@ -1,4 +1,2 @@
--color --color
--format --format documentation
progress
--backtrace

View file

@ -7,15 +7,13 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- rvm: 1.8.7 - rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3 - rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0" env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
notifications: notifications:
email: false email: false

View file

@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date:
With all dependencies in place and up-to-date we can now run the tests: With all dependencies in place and up-to-date we can now run the tests:
```shell ```shell
% rake spec % bundle exec rake spec
``` ```
This will execute all the [rspec tests](http://rspec-puppet.com/) tests This will execute all the [rspec tests](http://rspec-puppet.com/) tests
@ -178,8 +178,8 @@ installed on your system.
You can run them by issuing the following command You can run them by issuing the following command
```shell ```shell
% rake spec_clean % bundle exec rake spec_clean
% rspec spec/acceptance % bundle exec rspec spec/acceptance
``` ```
This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),