Heat Validation - VirtualMachineInterface

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

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 9fec52d..7052e31 100644 (file)
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -14,11 +14,6 @@
     </parent>
 
 
-    <properties>
-        <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
-        <docker.latest.tag>${project.version}-latest</docker.latest.tag>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -33,24 +28,17 @@
                         </goals>
                         <configuration>
                             <filesets>
-                                <fileset>
-                                    <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>
                                                <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>
+                                        <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>
@@ -74,6 +62,13 @@
                                        <include>normatives.tar.gz</include>
                                        </includes>
                                 </fileset>
+                                <fileset>
+                                    <directory>${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/</directory>
+                                    <followSymlinks>false</followSymlinks>
+                                    <includes>
+                                        <include>**/default.rb</include>
+                                    </includes>
+                                </fileset>
                                 <!-- Sanity jar -->
                                 <fileset>
                                     <directory>${project.basedir}/sdc-sanity</directory>
@@ -104,7 +99,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>
@@ -255,6 +250,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-resources-test-apis-ci</id>
                                 <phase>validate</phase>
@@ -272,7 +268,7 @@
                                         </resource>
                                     </resources>
                                 </configuration>
-                            </execution>
+                            </execution>                         
                             <execution>
                                                                <id>copy-normatives</id>
                                                                <phase>validate</phase>
@@ -290,32 +286,30 @@
                                                                                </resource>
                                                                        </resources>
                                                                </configuration>
-                                                       </execution>
+                                                       </execution>    
                         </executions>
                     </plugin>
-
-
+                        
                     <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>
-
+                                                   <username>docker</username>
+                                                   <password>docker</password>
+                                           </pull>
+                                   </authConfig>
                             <images>
 
                                 <!-- Build backend image -->
                                 <image>
-                                    <name>openecomp/sdc-backend</name>
+                                    <name>onap/sdc-backend</name>
                                     <alias>sdc-backend</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -330,7 +324,7 @@
 
                                 <!-- Build frontend image -->
                                 <image>
-                                    <name>openecomp/sdc-frontend</name>
+                                    <name>onap/sdc-frontend</name>
                                     <alias>sdc-frontend</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -342,10 +336,25 @@
                                         </tags>
                                     </build>
                                 </image>
-
+                                
+                                <!-- Build init-elastic search image -->
+                                                               <image>
+                                    <name>onap/sdc-init-elasticsearch</name>
+                                    <alias>sdc-init-elasticsearch</alias>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${project.basedir}/sdc-init-elasticsearch</dockerFileDir>
+                                        <tags>
+                                            <tag>${docker.tag}</tag>
+                                            <tag>${docker.latest.tag}</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                                
                                 <!-- Build elastic search image -->
                                 <image>
-                                    <name>openecomp/sdc-elasticsearch</name>
+                                    <name>onap/sdc-elasticsearch</name>
                                     <alias>sdc-elasticsearch</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -360,7 +369,7 @@
 
                                 <!-- Build kibana image -->
                                 <image>
-                                    <name>openecomp/sdc-kibana</name>
+                                    <name>onap/sdc-kibana</name>
                                     <alias>sdc-kibana</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -375,7 +384,7 @@
 
                                 <!-- Build cassandra image -->
                                 <image>
-                                    <name>openecomp/sdc-cassandra</name>
+                                    <name>onap/sdc-cassandra</name>
                                     <alias>sdc-cassandra</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -390,7 +399,7 @@
 
                                 <!-- Build sanity image -->
                                 <image>
-                                    <name>openecomp/sdc-sanity</name>
+                                    <name>onap/sdc-sanity</name>
                                     <alias>sdc-sanity</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -414,7 +423,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity<!-- ,openecomp/sdc-sanity --></image>
+                                    <image>onap/sdc-backend,onap/sdc-frontend,onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra,onap/sdc-sanity</image>
                                 </configuration>
                             </execution>
 
@@ -433,8 +442,7 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>
-                                        openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity<!-- ,openecomp/sdc-sanity --></image>
+                                    <image>onap/sdc-backend,onap/sdc-frontend,onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra,onap/sdc-sanity</image>
                                 </configuration>
                             </execution>
                         </executions>