Adding FaaS features into Integration repo

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

2) Features Comply with Guidelines:
https://git.opendaylight.org/gerrit/gitweb?p=faas.git;a=blob;f=features/src/main/features/features.xml

    a) Feature Names: odl-faas-all

    b) Features Descriptions: Present

    c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements

3) Features Tested:
    Features have been tested for functionality with

    a) feature:repo-add mvn:org.opendaylight.integration/features-integration-test/0.4.0.SNAPSHOT/xml/features
    b) feature:install odl-integration-compatible-with-all
    c) feature:install odl-faas-all

4) Integration Test Impact: None

Change-Id: Ib9c61f2844c2cba08837cfd47eb75a54f3bf3df2
Signed-off-by: chuxingjun <xingjun.chu@huawei.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 413b7b4283d94f5421eae0c1c565b436562cdf15..2001dd9c0b9ea8ad782a76340931654b8a99b3ec 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -149,6 +149,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.faas</groupId>
+      <artifactId>features-faas</artifactId>
+      <version>${feature.faas.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>features-groupbasedpolicy</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 43b60ef0b014cc652fd04e1b18d43d81b1fb8313..f7263c71a2dc98cf707feb648d989e82e62f9bc1 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -48,6 +48,7 @@
     <repository>mvn:org.opendaylight.didm/didm-features/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm.hp/features-hp/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.faas/features-faas/${feature.faas.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.iotdm/onem2m-features/${feature.iotdm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.3.0-SNAPSHOT/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 93d039f5c3f800460032233320106c8ef475cb80..e6d02fbd04f36e7e8d14f673b02af29a3fda806e 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -131,6 +131,7 @@
 
     <!-- Please use aphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
+        <feature version='${feature.faas.version}'>odl-faas-all</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>

diff --git a/pom.xml b/pom.xml
index efb1a8d2e8ba12d053975be81b04e34b80957b4d..fdc10734424f2c4ff4326c5ee92b5940442caf42 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
     <feature.capwap.version>0.2.0-SNAPSHOT</feature.capwap.version>
     <feature.coretutorials.version>1.1.0-SNAPSHOT</feature.coretutorials.version>
     <feature.dlux.version>0.3.0-SNAPSHOT</feature.dlux.version>
+    <feature.faas.version>1.0.0-SNAPSHOT</feature.faas.version>
     <feature.flow.version>1.3.0-SNAPSHOT</feature.flow.version>
     <feature.groupbasedpolicy.version>0.3.0-SNAPSHOT</feature.groupbasedpolicy.version>
     <feature.iotdm.version>0.1.0-SNAPSHOT</feature.iotdm.version>