From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 5 Aug 2016 15:25:59 +0000 (-0700)
Subject: Move atrium features to not-compatible
X-Git-Tag: release/boron~5
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b50d031eb4cf1f8c6ed4c79ad3de28beca49f489;hp=5b2aabd1cece1f03f14a317b350a023116672650;p=integration%2Fdistribution.git

Move atrium features to not-compatible

Some flows are interfering in the OpenFlow test.

Change-Id: Ifbd20c46fbace48125051ba361e3d022bd120c5a
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 ad9ce44f..9827b500 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -67,7 +67,6 @@
             Needs to be uncommented once in Boron
         <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
         -->
-        <feature version='${feature.atrium.version}'>odl-atrium-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
@@ -138,6 +137,7 @@
     <!-- Please use alphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
+        <feature version='${feature.atrium.version}'>odl-atrium-all</feature>
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>