Bug 7404: Remove Sdnitnerfaceapp from distribution

[integration/distribution.git] / features-test / src / main / resources / features.xml

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 5a93c4cda8a5cf42b881c10e2009c427d2250330..69c81dec8e73c45498fda8ce4991fafc0dfe2fb5 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -87,7 +87,6 @@
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
-        <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <!-- Failed netide merge job makes distribution fail
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
         <feature version='${feature.netide.version}'>odl-netide-app</feature>
@@ -103,7 +102,9 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
+        <!-- No snapshot artifacts available due to Bug 7404
         <feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
+        -->
         <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-sb-rest</feature>
@@ -121,7 +122,6 @@
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
-        <feature version='${feature.unimgr.version}'>odl-unimgr</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
@@ -158,6 +158,10 @@
         -->
         <feature version='${feature.natapp.version}'>odl-natapp</feature>
         <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
+        <!-- The following two Netconf features are incompatible with each other.
+        As CSIT jobs may use either of them, none of them can be in odl-integration-compatible-with-all. -->
+        <feature version='${feature.netconf.version}'>odl-netconf-clustered-topology</feature>
+        <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-openstack</feature>
         <feature version='${feature.netvirt.version}'>odl-netvirt-openstack-sfc-translator</feature>
         <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
@@ -175,6 +179,7 @@
         <!-- Issues with yang parser show up in aaa distribution-check
         <feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
         -->
+        <feature version='${feature.unimgr.version}'>odl-unimgr</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
         <feature version='${feature.yang-push.version}'>odl-yangpush</feature>