Merge pull request #9 from Martin819/master
Update .travis.yml, notififcations and platform envs
diff --git a/.kitchen.yml b/.kitchen.yml
index c024b42..e5902e0 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,16 +29,11 @@
sudo: true
platforms:
- - name: ubuntu-trusty
+ - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
driver_config:
- image: trevorj/salty-whales:trusty
+ image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
platform: ubuntu
-
- - name: ubuntu-xenial
- driver_config:
- image: trevorj/salty-whales:xenial
- platform: ubuntu
-
+
# - name: centos-7.1
suites:
diff --git a/.travis.yml b/.travis.yml
index 5d41eaf..4f34af2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,13 +13,28 @@
gem 'kitchen-docker'
gem 'kitchen-inspec'
gem 'inspec'
- gem 'kitchen-salt', :git => 'https://github.com/epcim/kitchen-salt.git', :branch => 'dependencis-pkg-repo2'
- #Waiting for PR#78
- #gem 'kitchen-salt', '>=0.2.25'
+ gem 'kitchen-salt', :git => 'https://github.com/salt-formulas/kitchen-salt.git'
- bundle install
+env:
+ - PLATFORM=trevorj/salty-whales:trusty
+ - PLATFORM=trevorj/salty-whales:xenial
+
+
before_script:
+ - set -o pipefail
- make test | tail
script:
- - test ! -e .kitchen.yml || bundle exec kitchen test
+ - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+
+notifications:
+ webhooks:
+ urls:
+ - https://webhooks.gitter.im/e/6123573504759330786b
+ on_success: change # options: [always|never|change] default: always
+ on_failure: never # options: [always|never|change] default: always
+ on_start: never # options: [always|never|change] default: always
+ on_cancel: never # options: [always|never|change] default: always
+ on_error: never # options: [always|never|change] default: always
+ email: false