<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.13.3-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>
</activation>
<build>
<plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
-
- </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>${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>
</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>
<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>
Code Review / sdc.git / blobdiff