Merge pull request #5 from mnederlof/poller-options
Make some options for ceilometer-agent-central configurable.
diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index a9eba8d..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=gerrit.mcp.mirantis.net
-port=29418
-project=salt-formulas/ceilometer.git
diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
new file mode 100644
index 0000000..f847543
--- /dev/null
+++ b/.kitchen.travis.yml
@@ -0,0 +1,6 @@
+suites:
+
+ - name: <%= ENV['SUITE'] %>
+ provisioner:
+ pillars-from-files:
+ neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.kitchen.yml b/.kitchen.yml
index a12d27d..8a6a314 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -33,9 +33,9 @@
sudo: true
platforms:
- - name: ubuntu-xenial
+ - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
driver_config:
- image: trevorj/salty-whales:xenial
+ image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
platform: ubuntu
suites:
diff --git a/.travis.yml b/.travis.yml
index 4f34af2..5589b31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,17 @@
- bundle install
env:
- - PLATFORM=trevorj/salty-whales:trusty
- - PLATFORM=trevorj/salty-whales:xenial
-
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=agent_cluster
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=agent_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=server_cluster
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=server_single
before_script:
- set -o pipefail
- make test | tail
script:
- - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+ - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
notifications:
webhooks: