Use new image for kitchen tests
Change-Id: I95d9b3b2ef3949844fe4fca1de5d520aef5396f3
diff --git a/.kitchen.yml b/.kitchen.yml
index cc0e724..dbb2fea 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -49,9 +49,9 @@
sudo: true
platforms:
- - name: <%= ENV['PLATFORM'] || 'ubuntu-xenial' %>
+ - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
driver_config:
- image: <%= ENV['PLATFORM'] || 'trevorj/salty-whales:xenial' %>
+ image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
platform: ubuntu
suites:
@@ -62,61 +62,57 @@
opencontrail.sls: tests/pillar/single3.sls
- name: single40
provisioner:
+ grains:
+ init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/single40.sls
- excludes:
- - ubuntu-trusty
- name: analytics3
provisioner:
pillars-from-files:
opencontrail.sls: tests/pillar/analytics3.sls
- name: analytics40
provisioner:
+ grains:
+ init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/analytics40.sls
- excludes:
- - ubuntu-trusty
- name: control3
provisioner:
pillars-from-files:
opencontrail.sls: tests/pillar/control3.sls
- name: control40
provisioner:
+ grains:
+ init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/control40.sls
- excludes:
- - ubuntu-trusty
- name: cluster3
provisioner:
pillars-from-files:
opencontrail.sls: tests/pillar/cluster3.sls
- name: cluster40
provisioner:
+ grains:
+ init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/cluster40.sls
- excludes:
- - ubuntu-trusty
- - name: tor3
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/tor3.sls
- - name: tor40
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/tor40.sls
- excludes:
- - ubuntu-trusty
+ # - name: tor3
+ # provisioner:
+ # pillars-from-files:
+ # opencontrail.sls: tests/pillar/tor3.sls
+ # - name: tor40
+ # provisioner:
+ # pillars-from-files:
+ # opencontrail.sls: tests/pillar/tor40.sls
- name: vrouter3
provisioner:
pillars-from-files:
opencontrail.sls: tests/pillar/vrouter3.sls
- excludes:
- - ubuntu-trusty
- name: vrouter40
provisioner:
+ grains:
+ init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/vrouter40.sls
- excludes:
- - ubuntu-trusty
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 22fbe08..a9c4dd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,36 +18,36 @@
- bundle install
env:
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=single3
- - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=analytics3
- - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=control3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=cluster3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=tor3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=vrouter3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=single3
- - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=analytics3
- - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=control3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=cluster3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=tor3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=vrouter3
- # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=single3
- #- PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=analytics3
- #- PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=control3
- # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=cluster3
- # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=tor3
- - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=vrouter3
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=single40
- #- PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=analytics40
- #- PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=control40
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=cluster40
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=tor40
- # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=vrouter40
- # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=single40
- - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=analytics40
- - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=control40
- # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=cluster40
- # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=tor40
- - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=vrouter40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc311 SUITE=single3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc311 SUITE=analytics3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc311 SUITE=control3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc311 SUITE=cluster3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc311 SUITE=vrouter3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc323 SUITE=single3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc323 SUITE=analytics3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc323 SUITE=control3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc323 SUITE=cluster3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc323 SUITE=vrouter3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc40 SUITE=single40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc40 SUITE=analytics40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc40 SUITE=control40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc40 SUITE=cluster40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OC_REPO=oc40 SUITE=vrouter40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc311 SUITE=single3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc311 SUITE=analytics3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc311 SUITE=control3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc311 SUITE=cluster3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc311 SUITE=vrouter3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc323 SUITE=single3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc323 SUITE=analytics3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc323 SUITE=control3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc323 SUITE=cluster3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc323 SUITE=vrouter3
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc40 SUITE=single40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc40 SUITE=analytics40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc40 SUITE=control40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc40 SUITE=cluster40
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OC_REPO=oc40 SUITE=vrouter40
before_script:
- set -o pipefail
diff --git a/tests/pillar/single40.sls b/tests/pillar/single40.sls
index 008a004..2e8c430 100644
--- a/tests/pillar/single40.sls
+++ b/tests/pillar/single40.sls
@@ -56,6 +56,7 @@
name: ntw-01
version: 4.0
enabled: true
+ config_only: True
bind:
address: 127.0.0.1
analytics:
@@ -115,6 +116,7 @@
data_dirs:
- /var/lib/cassandra
id: 1
+ config_only: True
analytics:
members:
- host: 127.0.0.1