From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 12 Jan 2016 12:25:29 +0000 (+0100)
Subject: Add odl-faas-base feature into distribution.
X-Git-Tag: release/boron~81
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=80a8646961432d46db791f4c7fe442342f38893b

Add odl-faas-base feature into distribution.

Recently, a merge in groupbasedpolicy [0]
has happened around the same time as distribution failures appeared,
which looked similar to the ones which lead to removing Faas.

But a fix in Vpnservice showed those failures are no more [1],
so perhaps now also Faas features will pass SingleFeatureTest.

However, Faas project has commented out odl-faas-all feature,
si this Change only adds odl-faas-base feature.

[0] https://git.opendaylight.org/gerrit/29419
[1] https://git.opendaylight.org/gerrit/32331

Change-Id: Ibd99a944c78ecc3bad0e0c36aa0602123594d42c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index aefcf94c..7a89c06c 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -147,9 +147,10 @@
         which leads to BindException.
         <feature version='${didm.version}'>odl-didm-all</feature>
 -->
-<!--
+        <!-- FAAS has disabled odl-faas-all feature due to timeouts in SingleFeatureTest
         <feature version='${feature.faas.version}'>odl-faas-all</feature>
--->
+        -->
+        <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ui</feature>