commit 9b51f7f4bfbccb7b89e31bc64183eaa2e412f24e
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Jan 19 13:49:59 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Fri Jan 19 13:49:59 2018 +0000
tree dfb0c48ec6784af7a11801473f6a512e87c29d6f
parent 31cca93edb43e20fa7aa27b17a8ab56fa7549642
parent 4b83f4ce0b6d3c20c275bedfb23a6219d38c7bd7

Merge "Enable logging.conf & fluentd for ceilometer"

.kitchen.travis.yml

diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 0c0fef8..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        ceilometer.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 5589b31..5d834e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,17 +17,18 @@
   - bundle install
 
 env:
-    - 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
+    - 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:
-  - 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:

ceilometer/meta/telegraf.yml

diff --git a/ceilometer/meta/telegraf.yml b/ceilometer/meta/telegraf.yml
index 4db03b7..074db4f 100644
--- a/ceilometer/meta/telegraf.yml
+++ b/ceilometer/meta/telegraf.yml
@@ -5,5 +5,5 @@
     http_response:
       ceilometer-api:
         address: "http://{{ server.bind.host|replace('0.0.0.0', '127.0.0.1') }}:{{ server.bind.port }}/"
-        expected_code: 300
-{%- endif %}
\ No newline at end of file
+        expected_code: 401
+{%- endif %}

tests/run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 8c07e58..ea1a363 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -111,7 +111,7 @@
 }
 
 salt_run() {
-    [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+    [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
     salt-call ${SALT_OPTS} $*
 }