commit df46d94be359315b859f9ae9a69c4a19c9701b79
author chnyda <chnyda@mirantis.com> Wed Oct 25 13:43:42 2017 +0200
committer Cedric Hnyda <chnyda@mirantis.com> Mon Oct 30 10:27:57 2017 +0000
tree 2fb88d4e0981916c6b7792d4ac77e71cd6ffcddb
parent c599d773cb9c5925c0b6461ee386fbf737a3e604

Refactor pkgs for contrail-database and fix kitchen tests

It is useless to specify supervisor in map.jinja because it is already
a dependency for the specified packages
Kitchen tests triggered unwanted tests, it is fixed by changing the name
of the suite.

Change-Id: I526c67095d06001283b5c67e3e43616a8bf4f31a

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 2fc6f70..950b7af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,24 +18,24 @@
   - bundle install
 
 env:
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=single
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=analytics
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=control
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=cluster
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=tor
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=vrouter
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=single
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=analytics
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=control
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=cluster
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=tor
-  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=vrouter
-  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=single
-  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=analytics
-  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=control
-  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=cluster
-  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=tor
-  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=vrouter
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=single3
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=analytics3
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=control3
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=cluster3
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=tor3
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=vrouter3
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=single3
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=analytics3
+  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=control3
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=cluster3
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=tor3
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=vrouter3
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=single3
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=analytics3
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=control3
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=cluster3
+  # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=tor3
+  - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=vrouter3
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=single40
   - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=analytics40
   - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=control40