Merge pull request #1 from salt-formulas/update-travis-deps
Update dependencies + sync .travis.yml with content in current linux …
diff --git "a/\173\173cookiecutter.project_name\175\175/.travis.yml" "b/\173\173cookiecutter.project_name\175\175/.travis.yml"
index 15fd7bc..bd09d8d 100644
--- "a/\173\173cookiecutter.project_name\175\175/.travis.yml"
+++ "b/\173\173cookiecutter.project_name\175\175/.travis.yml"
@@ -2,6 +2,11 @@
services:
- docker
+addons:
+ apt:
+ packages:
+ - apt-transport-https
+
install:
- git fetch --unshallow --tags
- pip install PyYAML
@@ -15,12 +20,12 @@
gem 'kitchen-docker'
gem 'kitchen-inspec'
gem 'inspec'
- gem 'kitchen-salt', :git => 'https://github.com/salt-formulas/kitchen-salt.git'
+ 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
+ - PLATFORM=trevorj/salty-whales:bionic
before_script:
- set -o pipefail
@@ -28,15 +33,16 @@
- reno lint $PWD | tail
script:
- - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+ - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
+ - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/6123573504759330786b
- on_success: change # options: [always|never|change] default: always
+ 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_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
diff --git "a/\173\173cookiecutter.project_name\175\175/debian/control" "b/\173\173cookiecutter.project_name\175\175/debian/control"
index 9b6a0d9..edb1e07 100644
--- "a/\173\173cookiecutter.project_name\175\175/debian/control"
+++ "b/\173\173cookiecutter.project_name\175\175/debian/control"
@@ -10,6 +10,6 @@
Package: salt-formula-{{cookiecutter.service_name}}
Architecture: all
-Depends: ${misc:Depends}, salt-master, reclass
+Depends: ${misc:Depends}
Description: {{cookiecutter.service_name}} salt formula
Install and configure {{cookiecutter.service_name}}.