Merge "Simplify InfraUtils"

[so.git] / packages / docker / pom.xml

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index f011618..8cd6565 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.openecomp.mso</groupId>
                <artifactId>packages</artifactId>
-               <version>0.0.4-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <packaging>pom</packaging>
@@ -18,11 +18,48 @@
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <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.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>mso/chef-repo</mso.chef.git.url.suffix.chef.repo>
+               <mso.chef.git.url.suffix.chef.config>mso/mso-config</mso.chef.git.url.suffix.chef.config>
+               <mso.project.version>${project.version}</mso.project.version>
        </properties>
 
        <build>
                <finalName>${project.artifactId}-${project.version}</finalName>
                <plugins>
+                   <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <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>
@@ -35,9 +72,9 @@
                                                </goals>
                                                <phase>initialize</phase>
                                                <configuration>
-                                                       <connectionUrl>scm:git:ssh://gerrit.openecomp.org:29418/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>
@@ -50,9 +87,9 @@
                                                </goals>
                                                <phase>initialize</phase>
                                                <configuration>
-                                                       <connectionUrl>scm:git:ssh://gerrit.openecomp.org:29418/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>
@@ -106,7 +143,10 @@
                                                        <name>openecomp/mso-arquillian:%l</name>
                                                        <alias>mso-arquillian</alias>
                                                        <build>
-
+                                                               <tags>
+                                                                   <tag>${project.docker.latesttag.version}</tag>
+                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                                               </tags>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
                                                                <dockerFile>docker-files/Dockerfile.mso-arquillian</dockerFile>
@@ -117,7 +157,10 @@
                                                        <name>openecomp/mso:%l</name>
                                                        <alias>mso</alias>
                                                        <build>
-
+                                                               <tags>
+                                                                   <tag>${project.docker.latesttag.version}</tag>
+                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                                               </tags>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
                                                                <dockerFile>docker-files/Dockerfile.mso-chef-final</dockerFile>