From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 31 Jul 2016 18:08:53 +0000 (-0700)
Subject: Remove netide from distribution
X-Git-Tag: release/boron~17
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=c94af07ca1d9f4b6ea9cf8345ec436064f46f722

Remove netide from distribution

Failed netide merge job makes distribution fail.

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

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 45777eb4..ef5bbf0d 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -309,6 +309,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- Failed netide merge job makes distribution fail
         <dependency>
             <groupId>org.opendaylight.netide</groupId>
             <artifactId>netide-features</artifactId>
@@ -316,6 +317,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.neutron</groupId>
             <artifactId>features-neutron</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 15fa527c..83f0ff17 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -68,7 +68,9 @@
     <repository>mvn:org.opendaylight.netconf/features-netconf/${feature.netconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${feature.netconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-restconf/${feature.restconf.version}/xml/features</repository>
+    <!-- Failed netide merge job makes distribution fail
     <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index b066d6ec..bd369f57 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -97,8 +97,10 @@
         <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
         <feature version='${feature.neutron.version}'>odl-neutron-service</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>
+        -->
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>