commit 8ecddf0ec5c802ff227f6e7b4608c4e0f8617131
author Martin Polreich <polreichmartin@gmail.com> Fri Feb 16 11:25:17 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Fri Feb 16 12:13:06 2018 +0100
tree 07270590d50b1d61eb44991e2b5af8da90a69e85
parent 962890f3c24bc50610fd08310587a1368feee436

Use new image for kitchen tests

Change-Id: I4552830ce06bc4f9fd699d345fa0ca9bf9130f17

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index cdba2b5..d4b5b48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,28 +18,18 @@
 
 env:
 
-  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-default
-  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=minion-multi-master-failover
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-default
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=minion-multi-master-failover
-# TODO, once 18.04 LTS Bionic Beaver is released, rename trusty to bionic
-  - PLATFORM=trevorj/salty-whales:bionic-2017.7 SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:bionic-2017.7 SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=control-default
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion-multi-master-failover
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=control-default
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion-multi-master-failover
-# TODO, once 18.04 LTS Bionic Beaver is released, rename trusty to bionic
-  - PLATFORM=trevorj/salty-whales:bionic SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:bionic SUITE=minion-default
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-default
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-default
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=minion-default
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=minion-multi-master-failover
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-default
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-default
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=minion-default
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=minion-multi-master-failover
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=control-default
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-default
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=minion-default
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=minion-multi-master-failover
 
 before_script:
   - set -o pipefail