X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fpom.xml;h=adcde83fe1aab9fe4c1e5662f3e644e27ee4c5e4;hb=refs%2Fchanges%2F70%2F129770%2F5;hp=f49c4e7b6035352b5d58d45c6e1fb63c12958b9f;hpb=c4d387d216e72911f80c1ebee91b73aba191b91b;p=sdc.git

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index f49c4e7b60..adcde83fe1 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.11.6-SNAPSHOT</version>
     </parent>
 
 
@@ -39,6 +39,7 @@
                                     </includes>
                                 </validationSet>
                             </validationSets>
+                            <skip>${skipYamlJsonValidator}</skip>
                         </configuration>
                     </execution>
                 </executions>
@@ -58,74 +59,34 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
-                            <apiVersion>1.23</apiVersion>
-                            <registry>nexus3.onap.org:10001</registry>
+                            <verbose>${verbose}</verbose>
+                            <apiVersion>${docker.api.version}</apiVersion>
+                            <registry>${docker.registry}</registry>
                             <authConfig>
                                 <pull>
-                                    <username>docker</username>
-                                    <password>docker</password>
+                                    <username>${docker.username}</username>
+                                    <password>${docker.password}</password>
                                 </pull>
                             </authConfig>
                             <images>
 
-                                <!-- 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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-
-                                <!-- Build elastic search image -->
-                                <image>
-                                    <name>onap/sdc-elasticsearch</name>
-                                    <alias>sdc-elasticsearch</alias>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/sdc-elasticsearch</dockerFileDir>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-
-                                <!-- Build kibana image -->
-                                <image>
-                                    <name>onap/sdc-kibana</name>
-                                    <alias>sdc-kibana</alias>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/sdc-kibana</dockerFileDir>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-
                                 <!-- Build cassandra image -->
                                 <image>
-                                    <name>onap/sdc-cassandra</name>
+                                    <name>${docker.namespace}/sdc-cassandra</name>
                                     <alias>sdc-cassandra</alias>
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${project.basedir}/sdc-cassandra</dockerFileDir>
                                         <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                                            <tag>latest</tag>
+                                            <tag>
+                                                ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+                                            </tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
                                         </tags>
                                     </build>
                                 </image>
 
-
-
                             </images>
                         </configuration>
                         <executions>
@@ -137,7 +98,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra</image>
+                                    <image>${docker.namespace}/sdc-cassandra</image>
                                 </configuration>
                             </execution>
 
@@ -156,7 +117,7 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra</image>
+                                    <image>${docker.namespace}/sdc-cassandra</image>
                                 </configuration>
                             </execution>
                         </executions>