update version

[sdc.git] / sdc-os-chef / pom.xml

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 84e9274..bbc98dd 100644 (file)
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -4,11 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sdc-os-chef</artifactId>
+    <packaging>pom</packaging>
+    
 
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.1-SNAPSHOT</version>
     </parent>
 
 
@@ -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>
@@ -147,6 +182,7 @@
                                                                                        <include>Artifact-Generator.properties</include>
                                                                                        <include>error-configuration.yaml</include>
                                                                                        <include>ecomp-error-configuration.yaml</include>
+                                                                                        <include>config-vnfsdk.yaml</include>
                                                                                        <include>logback.xml</include>
                                                                                </includes>
                                                                        </resource>
@@ -163,6 +199,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 +216,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-resources-fe</id>
                                 <phase>validate</phase>
@@ -183,6 +226,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 +241,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-tests-suites</id>
                                 <phase>validate</phase>
@@ -210,6 +260,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-resources-test-apis-ci</id>
                                 <phase>validate</phase>
@@ -255,7 +306,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>
 
@@ -263,12 +331,18 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.19.1</version>
+                        <version>0.23.0</version>
 
                         <configuration>
                             <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
-                            <registry>nexus3.onap.org:10003</registry>
+                            <registry>nexus3.onap.org:10001</registry>
+                            <authConfig>
+                                <pull>
+                                                   <username>docker</username>
+                                                   <password>docker</password>
+                                           </pull>
+                                   </authConfig>
                             <images>
 
                                 <!-- Build backend image -->
@@ -356,7 +430,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 +462,6 @@
                                 <id>push-images</id>
                                 <phase>deploy</phase>
                                 <goals>
-                                    <goal>build</goal>
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>