X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fubuntu%2Fpom.xml;h=c36999d4d173c1f78ffcffb2f550e19c5af48f66;hb=ffac85c6fe621a33acb96881dc986e623f0459f6;hp=5397b4ba28e47b98759e8a83920e110ebf7578fd;hpb=b2175581c55981e2eb039f3543baffe76d13394d;p=sdnc%2Foam.git

diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
index 5397b4ba..c36999d4 100644
--- a/installation/ubuntu/pom.xml
+++ b/installation/ubuntu/pom.xml
@@ -3,29 +3,60 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.openecomp.sdnc.oam</groupId>
+		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.sdnc.oam</groupId>
+	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-ubuntu</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<name>Installation - ubuntu</name>
 	<description>Creates base ubuntu Docker container</description>
 
 	<properties>
-		<image.name>openecomp/ubuntu-sdnc-image</image.name>
+		<image.name>onap/ubuntu-sdnc-image</image.name>
+		<sdnc.project.version>${project.version}</sdnc.project.version>
 	</properties>
 
 
 	<build>
 		<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['sdnc.project.version'];
+								def versionArray;
+								if ( project.properties['sdnc.project.version'] != null ) {
+									versionArray =
+									project.properties['sdnc.project.version'].split('\\.');
+								}
+
+								if (project.properties['sdnc.project.version'].endsWith("-amsterdam")) {
+									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-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>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
@@ -41,8 +72,9 @@
 								<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
 								<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
 								<tags>
-								<tag>${project.version}</tag>
-								<tag>latest</tag>
+									<tag>${project.version}</tag>
+									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
 							</build>
 						</image>