Update Kitchen test suites and Travis settings
diff --git a/.kitchen.yml b/.kitchen.yml
index 52aeb8b..42ec81a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -14,12 +14,6 @@
formula: opencontrail
grains:
noservices: True
- vendor_repo:
- - type: apt
- url: http://apt-mk.mirantis.com/trusty
- key_url: http://apt-mk.mirantis.com/public.gpg
- components: oc303 extra
- distribution: nightly
dependencies:
- name: linux
repo: git
@@ -33,6 +27,8 @@
top.sls:
base:
"*":
+ - linux_repo_openstack
+ - linux_repo_opencontrail
- linux_repo_cassandra
- linux_repo_mos
- linux
@@ -43,83 +39,28 @@
system:
enabled: true
name: opencontrail
- network:
- enabled: true
- hostname: opencontrail
- interface:
- vhost0:
- enabled: True
- type: eth
opencontrail_juniper.sls: {}
pillars-from-files:
linux_repo_mos.sls: tests/pillar/repo_mos8.sls
linux_repo_cassandra.sls: tests/pillar/repo_cassandra.sls
+ linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail.sls
+ linux_repo_openstack.sls: tests/pillar/repo_openstack.sls
verifier:
name: inspec
sudo: true
platforms:
- - name: <%= ENV['PLATFORM'] || 'ubuntu-trusty' %>
+ - name: <%= ENV['PLATFORM'] || 'ubuntu-xenial' %>
driver_config:
- image: <%= ENV['PLATFORM'] || 'trevorj/salty-whales:trusty' %>
+ image: <%= ENV['PLATFORM'] || 'trevorj/salty-whales:xenial' %>
platform: ubuntu
suites:
- - name: analytics
+ - name: <%= ENV['SUITE'] || 'single' %>
provisioner:
pillars-from-files:
- opencontrail.sls: tests/pillar/analytics.sls
-
- - name: cluster
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/cluster.sls
-
- - name: control
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/control.sls
-
- - name: single
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/single.sls
-
-
-# Note: require juniper contrail repo available
- - name: vendor-juniper
- provisioner:
- vendor_repo:
- - type: apt
- url: http://aptly.local/contrail
- key_url: http://aptly.local/public.gpg
- components: main
- distribution: trusty
- pillars-from-files:
- opencontrail.sls: tests/pillar/control.sls
- pillars:
- opencontrail_juniper.sls:
- opencontrail:
- common:
- vendor: juniper
-
-# Note: Following suites not pass on docker platform
-# the scope of the test may be limited.
- - name: tor
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/tor.sls
-
- - name: vrouter_kubernetes
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/vrouter_kubernetes.sls
-
- - name: vrouter
- provisioner:
- pillars-from-files:
- opencontrail.sls: tests/pillar/vrouter.sls
+ opencontrail.sls: tests/pillar/<%= ENV['SUITE'] || 'single' %>.sls
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125