<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.mso</groupId>
+ <groupId>org.onap.so</groupId>
<artifactId>packages</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
- <groupId>org.openecomp.mso</groupId>
<artifactId>docker</artifactId>
<name>MSO Docker Deliveries</name>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- If the maven profile "docker" is specified the parameter -Dmso.git.url=<MsoGitRepo> must be provided
i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.openecomp.org/r-->
- <mso.git.url>${env.GIT_NO_PROJECT}</mso.git.url>
+ <mso.chef.git.url.prefix>${env.GIT_NO_PROJECT}</mso.chef.git.url.prefix>
+ <mso.chef.git.branchname>master</mso.chef.git.branchname>
+ <mso.chef.git.url.suffix.chef.repo>so/chef-repo</mso.chef.git.url.suffix.chef.repo>
+ <mso.chef.git.url.suffix.chef.config>so/so-config</mso.chef.git.url.suffix.chef.config>
+ <mso.project.version>${project.version}</mso.project.version>
+ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+ <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
</properties>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ println project.properties['mso.project.version'];
+ def versionArray;
+ if ( project.properties['mso.project.version'] != null ) {
+ versionArray = project.properties['mso.project.version'].split('\\.');
+ }
+
+ if ( project.properties['mso.project.version'].endsWith("-SNAPSHOT") ) {
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+ } else {
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ }
+
+ println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
</goals>
<phase>initialize</phase>
<configuration>
- <connectionUrl>scm:git:${mso.git.url}/mso/chef-repo</connectionUrl>
+ <connectionUrl>scm:git:${mso.chef.git.url.prefix}/${mso.chef.git.url.suffix.chef.repo}</connectionUrl>
<checkoutDirectory>src/main/docker/docker-files/chef-configs/chef-repo</checkoutDirectory>
- <scmVersion>master</scmVersion>
+ <scmVersion>${mso.chef.git.branchname}</scmVersion>
<scmVersionType>branch</scmVersionType>
<skipCheckoutIfExists>true</skipCheckoutIfExists>
<pushChanges>false</pushChanges>
</goals>
<phase>initialize</phase>
<configuration>
- <connectionUrl>scm:git:${mso.git.url}/mso/mso-config</connectionUrl>
+ <connectionUrl>scm:git:${mso.chef.git.url.prefix}/${mso.chef.git.url.suffix.chef.config}</connectionUrl>
<checkoutDirectory>src/main/docker/docker-files/chef-configs/mso-config</checkoutDirectory>
- <scmVersion>master</scmVersion>
+ <scmVersion>${mso.chef.git.branchname}</scmVersion>
<scmVersionType>branch</scmVersionType>
<skipCheckoutIfExists>true</skipCheckoutIfExists>
<pushChanges>false</pushChanges>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.19.1</version>
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
+ <pullRegistry>${docker.pull.registry}</pullRegistry>
+ <pushRegistry>${docker.push.registry}</pushRegistry>
<images>
<image>
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.jacoco</dockerFile>
+ <dockerFile>Dockerfile.jacoco</dockerFile>
</build>
</image>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.ubuntu-16.04-update</dockerFile>
+ <dockerFile>Dockerfile.ubuntu-16.04-update</dockerFile>
</build>
</image>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.wildfly-10</dockerFile>
-
- </build>
- </image>
- <image>
- <name>openecomp/mso-arquillian:%l</name>
- <alias>mso-arquillian</alias>
- <build>
- <tags>
- <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
- </tags>
- <cleanup>try</cleanup>
- <dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.mso-arquillian</dockerFile>
+ <dockerFile>Dockerfile.wildfly-10</dockerFile>
</build>
</image>
<image>
<name>openecomp/mso:%l</name>
- <alias>mso</alias>
+ <alias>onap/so:%1</alias>
+ <alias>openecomp/mso:%l</alias>
+ <alias>so</alias>
<build>
<tags>
<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latesttag.version}</tag>
</tags>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.mso-chef-final</dockerFile>
+ <dockerFile>Dockerfile.mso-chef-final</dockerFile>
<assembly>
<basedir>/</basedir>
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>openecomp/mso-arquillian:%l,openecomp/mso:%l</image>
+ <image>openecomp/mso:%l</image>
</configuration>
</execution>
<goal>push</goal>
</goals>
<configuration>
- <image>openecomp/mso-arquillian:%l,openecomp/mso:%l,openecomp/jacoco:1.0</image>
+ <image>openecomp/mso:%l,openecomp/jacoco:1.0</image>
</configuration>
</execution>
</executions>
Code Review / so.git / blobdiff