Add plugins to test pillars and enable services testing
Change-Id: I25bed145c6a03cd5c134a5e33a090bffb695a69c
diff --git a/.kitchen.yml b/.kitchen.yml
index e8e4015..a339105 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -13,7 +13,7 @@
log_level: error
formula: rabbitmq
grains:
- noservices: True
+ noservices: False
state_top:
base:
"*":
@@ -41,9 +41,9 @@
pillars-from-files:
rabbitmq.sls: tests/pillar/rabbitmq_server.sls
- - name: rabbitmq_server_ssl
+ - name: rabbitmq_ssl_server
provisioner:
pillars-from-files:
- rabbitmq.sls: tests/pillar/rabbitmq_server_ssl.sls
+ rabbitmq.sls: tests/pillar/rabbitmq_ssl_server.sls
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index f6f2e45..937cb9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@
env:
- PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq_server
- PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq_server
+# - PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq_ssl_server
+# - PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq_ssl_server
before_script:
- set -o pipefail
diff --git a/tests/pillar/rabbitmq_server.sls b/tests/pillar/rabbitmq_server.sls
index 577a576..b955196 100644
--- a/tests/pillar/rabbitmq_server.sls
+++ b/tests/pillar/rabbitmq_server.sls
@@ -8,6 +8,7 @@
admin:
name: adminuser
password: pwd
+ service: rabbitmq-server
host:
'/':
enabled: true
@@ -19,5 +20,6 @@
definition: '{"ha-mode": "all"}'
memory:
vm_high_watermark: 0.4
- plugins: ['']
-
+ plugins:
+ - amqp_client
+ - rabbitmq_management
diff --git a/tests/pillar/rabbitmq_server_ssl.sls b/tests/pillar/rabbitmq_ssl_server.sls
similarity index 98%
rename from tests/pillar/rabbitmq_server_ssl.sls
rename to tests/pillar/rabbitmq_ssl_server.sls
index 829eeb7..d856272 100644
--- a/tests/pillar/rabbitmq_server_ssl.sls
+++ b/tests/pillar/rabbitmq_ssl_server.sls
@@ -147,4 +147,6 @@
definition: '{"ha-mode": "all"}'
memory:
vm_high_watermark: 0.4
- plugins: ['']
+ plugins:
+ - amqp_client
+ - rabbitmq_management