Adding armoury feature

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/armoury/job/armoury-merge-beryllium/

2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=armoury.git;a=blob;f=features/src/main/features/features.xml;h=dbcccd7b51392c2d9b31c464356bb4e2f1fb1046;hb=HEAD
a) Feature Names: odl-armoury-workloadmanager
b) Features Descriptions: Present
c) Features Start-Levels: N/A

3) Features Tested: Features have been tested for functionality with
a) feature:install odl-armoury-workloadmanager
b) feature:install odl-armoury-workloadmanager odl-integration-compatible-with-all

4) Integration Test Impact: N/A

Change-Id: I4dd6bdb8dda0da805605cef5e244d97b619a54b6
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 99732f09ad4a7a612bfde2924e1ecc1dc5f5ec03..373e527fe426020c5b3d941af0567b0881d47de6 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -53,6 +53,13 @@
       <type>xml</type>
     </dependency>
 -->
+    <dependency>
+      <groupId>org.opendaylight.armoury</groupId>
+      <artifactId>armoury-features</artifactId>
+      <version>${feature.armoury.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
        <groupId>org.opendaylight.bgpcep</groupId>
        <artifactId>features-bgp</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 57e8ef2a56b899dc3baede698ce0c0d64201107d..69fe813b20ff415029da611eab6219ba5b27b32a 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -36,6 +36,7 @@
 <!--
     <repository>mvn:org.opendaylight.alto/features-alto/${feature.alto.version}/xml/features</repository>
 -->
+    <repository>mvn:org.opendaylight.armoury/armoury-features/${feature.armoury.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index d1041af623e59d8cc89cba07c25c2d09e781e06c..34b67153a37db1d6f5797840b4f3506a2b734e90 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -66,6 +66,7 @@
 <!--
         <feature version='${feature.alto.version}'>odl-alto-integration-test</feature>
 -->
+        <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</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>

diff --git a/pom.xml b/pom.xml
index ad5bb0f0699bbe70747d64eaae625d1bab7c697e..ce089a11ecf9948b6e03c9bdb29268cd9c97398f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
     <didm.version>0.2.0-SNAPSHOT</didm.version>
     <feature.adsal.version>0.10.0-SNAPSHOT</feature.adsal.version>
     <feature.alto.version>0.2.0-SNAPSHOT</feature.alto.version>
+    <feature.armoury.version>1.0-SNAPSHOT</feature.armoury.version>
     <feature.bgpcep.version>0.5.0-SNAPSHOT</feature.bgpcep.version>
     <feature.capwap.version>0.2.0-SNAPSHOT</feature.capwap.version>
     <feature.coretutorials.version>1.1.0-SNAPSHOT</feature.coretutorials.version>