X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fpom.xml;h=d58071d8f3f4384c85742a85dfb27104fd492d8f;hb=99974dffda236f9853f44c518d28d8d43df7c0aa;hp=84e9274acfe006af73ab36317783b64895ce2d92;hpb=d3f06f1f2d9ee5824b7271e33330ee1223f087fe;p=sdc.git

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 84e9274acf..d58071d8f3 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -4,6 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sdc-os-chef</artifactId>
+    <packaging>pom</packaging>
+    
 
     <parent>
         <groupId>org.openecomp.sdc</groupId>
@@ -32,28 +34,63 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>
-                                        ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\
-                                    </directory>
+                                    <directory>${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\</directory>
                                     <followSymlinks>false</followSymlinks>
                                     <includes>
                                         <include>**/default.rb</include>
                                     </includes>
                                 </fileset>
-                                    <!-- static configuration files -->
-                                    <fileset>	
-                                        <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory>
-                                        <includes>
+                                <!-- static configuration files -->
+                               	<fileset>	
+                               		<directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory>
+                               		<followSymlinks>false</followSymlinks>
+                                   	<includes>
                                         <include>Artifact-Generator.properties</include>
                                         <include>error-configuration.yaml</include>
                                         <include>ecomp-error-configuration.yaml</include>
                                         <include>logback.xml</include>
                                     </includes>
                                 </fileset>
+                                <!-- BE WAR's -->
+                                <fileset>	
+	                                <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend</directory>
+	                                <followSymlinks>false</followSymlinks>
+                                    <includes>
+    	                               	<include>*.war</include>
+                                   	</includes>
+                               	</fileset>
+                               	<!-- FE WAR's -->
+                                <fileset>	
+	                                <directory>${project.parent.basedir}/sdc-os-chef/sdc-frontend/</directory>
+	                                <followSymlinks>false</followSymlinks>
+                                    <includes>
+    	                               	<include>*.war</include>
+                                   	</includes>
+                               	</fileset>
+                                	<fileset>
+                                    <directory>${project.basedir}/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</directory>
+									<followSymlinks>false</followSymlinks>
+                                    <includes>
+    	                               	<include>normatives.tar.gz</include>
+                                   	</includes>
+                                </fileset>
                                 <fileset>
                                     <directory>${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools</directory>
                                     <followSymlinks>false</followSymlinks>
                                 </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>
@@ -71,9 +108,7 @@
                                 ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb
                             </path>
                             <lines>
-                                <line>normal['version'] =
-                                    "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
-                                </line>
+                                <line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line>
                             </lines>
                         </file>
                     </files>
@@ -163,6 +198,12 @@
                                 <configuration>
                                     <outputDirectory>${basedir}/sdc-backend</outputDirectory>
                                     <resources>
+                                    	<resource>
+                                            <directory>${project.parent.basedir}/catalog-be/target</directory>
+                                            <includes>
+                                                <include>catalog-be-${project.version}.war</include>
+                                            </includes>
+                                        </resource>
                                         <resource>
                                             <directory>
                                                 ${project.parent.basedir}/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target
@@ -174,6 +215,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-resources-fe</id>
                                 <phase>validate</phase>
@@ -183,6 +225,12 @@
                                 <configuration>
                                     <outputDirectory>${basedir}/sdc-frontend</outputDirectory>
                                     <resources>
+                                    	<resource>
+                                        	<directory>${project.parent.basedir}/catalog-fe/target</directory>
+                                            <includes>
+                                               	<include>catalog-fe-${project.version}.war</include>
+                                            </includes>
+                                        </resource>
                                         <resource>
                                             <directory>${project.parent.basedir}/openecomp-ui/target</directory>
                                             <includes>
@@ -192,6 +240,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-tests-suites</id>
                                 <phase>validate</phase>
@@ -255,7 +304,24 @@
                                 </configuration>
                             </execution>
                             
-                            
+                            <execution>
+								<id>copy-normatives</id>
+								<phase>validate</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
+									<resources>
+										<resource>
+											<directory>${project.parent.basedir}/catalog-be/target</directory>
+											<includes>
+												<include>normatives.tar.gz</include>
+											</includes>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
                         </executions>
                     </plugin>
 
@@ -269,6 +335,12 @@
                             <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
                             <registry>nexus3.onap.org:10003</registry>
+                            <authConfig>
+                                <pull>
+      					            <username>docker</username>
+      					            <password>docker</password>
+      				            </pull>
+    			            </authConfig>
                             <images>
 
                                 <!-- Build backend image -->
@@ -356,7 +428,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>
@@ -388,7 +460,6 @@
                                 <id>push-images</id>
                                 <phase>deploy</phase>
                                 <goals>
-                                    <goal>build</goal>
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>