From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 10 Jan 2016 00:20:12 +0000 (-0800)
Subject: Fix distribution
X-Git-Tag: release/beryllium~18
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=d0078f34547a785a76321621a70bcb55606ca321

Fix distribution

Remove vpnservice features as they timeout SingleFeature test.

Change-Id: Idfa91f604aa13b29e0134066668ac182b28fc0a1
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 42b00633..063eac08 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -134,7 +134,9 @@
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature>
         <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
+<!--    Commented out as it timeouts SingleFeature test.
         <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
+-->
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
@@ -167,7 +169,9 @@
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
 -->
         <feature version='${feature.tsdr.version}'>odl-tsdr-h2-all</feature>
+<!--    Commented out as it timeouts SingleFeature test.
         <feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</feature>
+-->
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
     </feature>