Update kitchen image version, change linux locales for tests
Change-Id: I5b146c466d9ee4110fd54e0421e944524641e9f6
diff --git a/.kitchen.yml b/.kitchen.yml
index e708ea2..a998cfd 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,9 +29,9 @@
sudo: true
platforms:
- - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial-2017.7'%>
+ - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
driver_config:
- image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial-2017.7'%>
+ image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
platform: ubuntu
diff --git a/.travis.yml b/.travis.yml
index 0b24242..4ba771d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,19 +22,14 @@
- bundle install
env:
- - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=network
- - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=network
- # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=storage
- # - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=storage
- - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=system
- - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=system
- - PLATFORM=trevorj/salty-whales:trusty SUITE=network
- - PLATFORM=trevorj/salty-whales:xenial SUITE=network
- # - PLATFORM=trevorj/salty-whales:trusty SUITE=storage
- # - PLATFORM=trevorj/salty-whales:xenial SUITE=storage
- - PLATFORM=trevorj/salty-whales:trusty SUITE=system
- - PLATFORM=trevorj/salty-whales:xenial SUITE=system
-## Test on both Salt version until there is new test policy accepted
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=network
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=network
+ # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=storage
+ # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=storage
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=system
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=system
+ # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=network
+ # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=system
before_script:
- set -o pipefail
diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls
index bcbfa08..eb6201e 100644
--- a/tests/pillar/system.sls
+++ b/tests/pillar/system.sls
@@ -204,10 +204,10 @@
key_url: http://apt-mk.mirantis.com/public.gpg
architectures: amd64
locale:
- en_US.UTF-8:
+ en_US:
enabled: true
default: true
- "cs_CZ.UTF-8 UTF-8":
+ cs_CZ:
enabled: true
autoupdates:
enabled: true