Optimize kitchen tests for Travis CI and fix test repo
Change-Id: I33fbc3b28f573936f0eb003bdfab9233e7c0cb76
diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 6bcad13..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
- - name: <%= ENV['SUITE'] %>
- provisioner:
- pillars-from-files:
- influxdb.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index 2e36211..9abec6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,8 @@
- make test | tail
script:
- - KITCHEN_LOCAL_YAML=.kitchen.travis.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:
diff --git a/influxdb/server.sls b/influxdb/server.sls
index 972dd28..4f9fdd2 100644
--- a/influxdb/server.sls
+++ b/influxdb/server.sls
@@ -6,6 +6,7 @@
influxdb_packages:
pkg.installed:
- names: {{ server.pkgs }}
+ - force_yes: True
{%- endif %}
{{ server.prefix_dir }}/etc/influxdb:
diff --git a/tests/pillar/repo_influxdata.sls b/tests/pillar/repo_influxdata.sls
index 012a7ae..3c8f522 100644
--- a/tests/pillar/repo_influxdata.sls
+++ b/tests/pillar/repo_influxdata.sls
@@ -3,6 +3,7 @@
enabled: true
repo:
linux_influxdata:
- source: "deb http://repos-backend.influxdata.com/ubuntu {{ grains.get('oscodename') }} stable"
+ source: "deb http://repos.influxdata.com/ubuntu {{ grains.get('oscodename') }} stable"
architectures: amd64
- key_url: "http://repos-backend.influxdata.com/influxdb.key"
+ # key_url: "http://repos.influxdata.com/influxdb.key"
+ # https repo not working - see https://github.com/influxdata/influxdb/issues/9199 for more info