Use new image for kitchen tests

Change-Id: I53f77c0f8b74f4b0ad87277abfa37f0604c9fe27
diff --git a/.travis.yml b/.travis.yml
index f045b94..3037663 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,82 +17,44 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-dpdk
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dpdk
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-dvr
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dvr
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dvr-fwaas-v1
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-legacy
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-legacy
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-nonexternal-dvr
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-nonexternal-dvr
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-sriov
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-sriov
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-qos-sriov
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-qos-sriov
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-qos
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-qos
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-ovn
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-cluster
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-cluster
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-dvr
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-dvr
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-nodvr
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-nodvr
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-single
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-single
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-lbaas-octavia
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-fwaas-v1
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-qos
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-qos
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-ovn
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-dns
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-dns
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-dvr
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-dvr
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-legacy
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-legacy
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-qos
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-qos
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-legacy-fwaas-v1
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-dpdk
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-dpdk
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-dvr
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-dvr
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-dvr-fwaas-v1
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-legacy
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-legacy
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-nonexternal-dvr
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-nonexternal-dvr
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-sriov
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-sriov
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-qos-sriov
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-qos-sriov
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-qos
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-qos
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-ovn
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=control-cluster
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-cluster
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=control-dvr
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-dvr
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=control-nodvr
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-nodvr
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=control-single
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-single
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-lbaas-octavia
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-fwaas-v1
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=control-qos
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-qos
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-ovn
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=control-dns
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=control-dns
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=gateway-dvr
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-dvr
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=gateway-legacy
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-legacy
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=gateway-qos
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-qos
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-legacy-fwaas-v1
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-dpdk
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-dpdk
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-dvr-fwaas-v1
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-legacy
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-legacy
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-nonexternal-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-nonexternal-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-sriov
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-sriov
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-qos-sriov
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-qos-sriov
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-qos
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-qos
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-ovn
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-cluster
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-cluster
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-nodvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-nodvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-lbaas-octavia
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-fwaas-v1
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-qos
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-qos
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-ovn
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-dns
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-dns
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=gateway-dvr
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=gateway-legacy
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-qos
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=gateway-qos
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=gateway-legacy-fwaas-v1
 before_script:
   - set -o pipefail
   - make test | tail