Move suites definition from .travis.yml to .kitchen.yml
Change-Id: I4a1dcffaf955519757dc96b3140983d8bbb45d80
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 be889a8..7284f4b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -33,21 +33,60 @@
sudo: true
platforms:
- - name: ubuntu-trusty
+ - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
driver_config:
- image: trevorj/salty-whales:trusty
- platform: ubuntu
-
- - name: ubuntu-xenial
- driver_config:
- image: trevorj/salty-whales:xenial
+ image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
platform: ubuntu
suites:
- - name: <%=ENV['SUITE'] || 'ceph_single'%>
+ - name: ceph_single
provisioner:
pillars-from-files:
- cinder.sls: tests/pillar/<%=ENV['SUITE'] || 'ceph_single'%>.sls
+ cinder.sls: tests/pillar/ceph_single.sls
+ - name: control_cluster
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/control_cluster.sls
+
+ - name: control_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/control_single.sls
+
+ - name: gpfs_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/gpfs_single.sls
+
+ - name: hp3par_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/hp3par_single.sls
+
+ - name: lefthand_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/lefthand_single.sls
+
+ - name: solidfire_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/solidfire_single.sls
+
+ - name: storwize_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/storwize_single.sls
+
+ - name: volume_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/volume_single.sls
+
+ - name: vsp_single
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/vsp_single.sls
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index c1872fe..77f72c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,23 +17,33 @@
- bundle install
env:
- - SUITE=ceph_single
- - SUITE=control_cluster
- - SUITE=control_single
- - SUITE=gpfs_single
- - SUITE=hp3par_single
- - SUITE=lefthand_single
- - SUITE=solidfire_single
- - SUITE=storwize_single
- - SUITE=volume_single
- - SUITE=vsp_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=ceph_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=ceph_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=control_cluster
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=control_cluster
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=control_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=control_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=gpfs_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=gpfs_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=hp3par_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=hp3par_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=lefthand_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=lefthand_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=solidfire_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=solidfire_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=storwize_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=storwize_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=volume_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=volume_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=vsp_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=vsp_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: