Add FaaS into distribution

Temporary comment faas features test due to SFT memory errors.

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

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 2c4c16121c9f75be8188d528080bb2267e59121d..84f74060ea5caefb4a3648cdbed50cba54f359f9 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -128,6 +128,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- FaaS -->
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>features4-faas</artifactId>
+                <version>${faas.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- InfraUtils -->
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index b398b1213131ef590d4c4d3bb4cfc3a550390ae8..1e4839a0be43a945180f9f39c47da253cd8b9ad2 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -150,6 +150,64 @@
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- FAAS -->
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-base</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-vxlan-ovs-adapter</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-vxlan-fabric</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-vlan-fabric</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-fabric</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-fabricmgr</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-uln-mapper</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.faas</groupId>
+                <artifactId>odl-faas-all</artifactId>
+                <version>${faas.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
             <!-- L2switch -->
             <dependency>
                 <groupId>org.opendaylight.l2switch</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 28f280526d045e452aeb7dd8093829469b74f779..bbaf6fc0b7d50d9b1a38e913aeafc05bfa3375a8 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -184,6 +184,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- FAAS -->
+        <dependency>
+            <groupId>org.opendaylight.faas</groupId>
+            <artifactId>features4-faas</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <!-- Genius -->
         <dependency>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index e724ae7fb38e7bb2c1b8e3432455d8a716c18ac2..c3df09e8828ff16299d96f82e78b1901de1a60ca 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -61,7 +61,7 @@
         <!-- External single feature dependencies in alphabetical order -->
 
         <!-- BIER -->
-        <!-- Comment out bier because of SFT memory problem
+        <!-- Comment out because of SFT memory problem
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>odl-bier-all</artifactId>
@@ -78,6 +78,16 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- FaaS -->
+        <!-- Comment out because of SFT memory problem
+        <dependency>
+            <groupId>org.opendaylight.faas</groupId>
+            <artifactId>odl-faas-all</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        -->
+
         <!-- Genius -->
         <dependency>
             <groupId>org.opendaylight.genius</groupId>