X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=blobdiff_plain;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=b7684faeff38f9798d33f04be53a3f01df209e26;hp=5a93c4cda8a5cf42b881c10e2009c427d2250330;hb=25dc200dea3223fcd0582da03ef832eb5299c62e;hpb=b34e0b639ced1a5457d8c595e3a8f135dd6020c2

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 5a93c4cd..b7684fae 100644
--- 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>
@@ -158,6 +157,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