X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fpom.xml;h=01cc2950238a54db5ece03999a2dd9b5216a6574;hb=fcebea12e92e470154d52e07950f2187f72a88fc;hp=42bc8b2fe1a04bc570f5b58bed7f6e88571c0b39;hpb=b5fc68f8df7d253da2be2d42b0533e01884e0686;p=sdc.git

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 42bc8b2fe1..01cc295023 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -10,75 +10,12 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>clean.tosca.chef.os.folder</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </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>
-                                <!-- 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>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>ru.yaal.maven</groupId>
-                <artifactId>write-text-files-maven-plugin</artifactId>
-                <configuration>
-                    <charset>UTF-8</charset>
-                    <files>
-                        <file>
-                            <path>
-                                ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb
-                            </path>
-                            <lines>
-                                <line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line>
-                            </lines>
-                        </file>
-                    </files>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>write-text-files</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>write-text-files</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.github.sylvainlaurent.maven</groupId>
                 <artifactId>yaml-json-validator-maven-plugin</artifactId>
@@ -102,6 +39,7 @@
                                     </includes>
                                 </validationSet>
                             </validationSets>
+                            <skip>${skipYamlJsonValidator}</skip>
                         </configuration>
                     </execution>
                 </executions>
@@ -121,7 +59,8 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
-                            <apiVersion>1.23</apiVersion>
+                            <verbose>${verbose}</verbose>
+                            <apiVersion>${docker.api.version}</apiVersion>
                             <registry>nexus3.onap.org:10001</registry>
                             <authConfig>
                                 <pull>
@@ -131,48 +70,6 @@
                             </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>
@@ -181,14 +78,15 @@
                                         <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>
@@ -200,7 +98,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra</image>
+                                    <image>onap/sdc-cassandra</image>
                                 </configuration>
                             </execution>
 
@@ -219,7 +117,7 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra</image>
+                                    <image>onap/sdc-cassandra</image>
                                 </configuration>
                             </execution>
                         </executions>