From 15c2ce7ea39ebfcf4ccae699e4a8c95a9a88a5e0 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Wed, 18 Oct 2017 19:47:40 +0300
Subject: Sanity docker build

Sanity docker build & vLB + vCSCF_aligned VNF addition

Change-Id: I5998c7232c1a99c6ad83066f6dd19cd45bb8b351
Issue-ID: SDC-478
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 sdc-os-chef/pom.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'sdc-os-chef/pom.xml')

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index a4c8036214..009c86ec44 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -74,7 +74,19 @@
     	                               	<include>normatives.tar.gz</include>
                                    	</includes>
                                 </fileset>
-                                
+                                <!-- Sanity jar -->
+                                <fileset>
+                                    <directory>${project.basedir}/sdc-sanity</directory>
+                                    <followSymlinks>false</followSymlinks>
+                                    <includes>
+    	                               	<include>*.jar</include>
+                                   	</includes>
+                                </fileset>
+                                <!-- Sanity test suites -->
+                                <fileset>
+                                    <directory>${project.basedir}/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites</directory>
+                                    <followSymlinks>false</followSymlinks>
+                                </fileset>
                             </filesets>
                         </configuration>
                     </execution>
@@ -380,7 +392,7 @@
                                         <tags>
                                             <tag>${docker.tag}</tag>
                                             <tag>${docker.latest.tag}</tag>
-                                            <tag>1.1-STAGING-latest</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
                                         </tags>
                                     </build>
                                 </image>
-- 
cgit 1.2.3-korg