X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fpom.xml;h=5ad9d2c539a8225e9c6f2a7af2c879fb7003925a;hb=0d9cc11b4daf60efbe4b7cebbbc6589200cddd53;hp=8b6337205d6440969b6a10433e4df64f423901f7;hpb=a5445100050e49e83f73424198d73cd72d672a4d;p=sdc.git

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 8b6337205d..5ad9d2c539 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -10,88 +10,44 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.10.2-SNAPSHOT</version>
     </parent>
 
 
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
+                <groupId>com.github.sylvainlaurent.maven</groupId>
+                <artifactId>yaml-json-validator-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>clean.tosca.chef.os.folder</id>
-                        <phase>clean</phase>
+                        <id>validate</id>
+                        <phase>validate</phase>
                         <goals>
-                            <goal>clean</goal>
+                            <goal>validate</goal>
                         </goals>
                         <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/</directory>
-                                    <followSymlinks>false</followSymlinks>
+                            <validationSets>
+                                <validationSet>
                                     <includes>
-                                        <include>**/default.rb</include>
+                                        <include>**/*.y*ml</include>
                                     </includes>
-                                </fileset>
-                                <!-- Sanity jar -->
-                                <fileset>
-                                    <directory>${project.basedir}/sdc-sanity</directory>
-                                    <followSymlinks>false</followSymlinks>
+                                </validationSet>
+                                <validationSet>
                                     <includes>
-                                        <include>*.jar</include>
+                                        <include>**/*.json</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>
+                                </validationSet>
+                            </validationSets>
+                            <skip>${skipYamlJsonValidator}</skip>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>ru.yaal.maven</groupId>
-                <artifactId>write-text-files-maven-plugin</artifactId>
-                <version>1.1</version>
-                <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>
         </plugins>
     </build>
 
     <profiles>
-        <profile>
-            <id>docker-staging</id>
-            <properties>
-                <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
-                <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
-            </properties>
-        </profile>
-
         <profile>
             <id>docker</id>
             <activation>
@@ -99,138 +55,34 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
-                        <executions>
-                            <execution>
-                                <id>copy-tests-suites</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.parent.basedir}/test-apis-ci/src/main/resources/ci/testSuites</directory>
-                                            <includes>
-                                                <include>*</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-resources-test-apis-ci</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${basedir}/sdc-sanity</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.parent.basedir}/test-apis-ci/target</directory>
-                                            <includes>
-                                                <include>test-apis-ci-${project.version}-jar-with-dependencies.jar</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${fabric8.version}</version>
-
                         <configuration>
-                            <verbose>true</verbose>
-                            <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>${docker.latest.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>${docker.latest.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>${docker.latest.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>${docker.latest.tag}</tag>
-                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-
-                                <!-- Build sanity image -->
-                                <image>
-                                    <name>onap/sdc-sanity</name>
-                                    <alias>sdc-sanity</alias>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${project.basedir}/sdc-sanity</dockerFileDir>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.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>
@@ -246,7 +98,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra,onap/sdc-sanity</image>
+                                    <image>${docker.namespace}/sdc-cassandra</image>
                                 </configuration>
                             </execution>
 
@@ -265,7 +117,7 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>onap/sdc-init-elasticsearch,onap/sdc-elasticsearch,onap/sdc-kibana,onap/sdc-cassandra,onap/sdc-sanity</image>
+                                    <image>${docker.namespace}/sdc-cassandra</image>
                                 </configuration>
                             </execution>
                         </executions>