X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fubuntu%2Fpom.xml;h=c36999d4d173c1f78ffcffb2f550e19c5af48f66;hb=bd040b5ca256a803cbf5c01802b7d1bf967f6fb5;hp=34b74b964f5903f414b09135fcafdf7aab55baea;hpb=3be2dec90f877dbca6c9663410053ae7dd229179;p=sdnc%2Foam.git

diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
index 34b74b96..c36999d4 100644
--- a/installation/ubuntu/pom.xml
+++ b/installation/ubuntu/pom.xml
@@ -3,22 +3,22 @@
 	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>
 
@@ -40,19 +40,14 @@
 								println project.properties['sdnc.project.version'];
 								def versionArray;
 								if ( project.properties['sdnc.project.version'] != null ) {
-								versionArray =
-								project.properties['sdnc.project.version'].split('\\.');
+									versionArray =
+									project.properties['sdnc.project.version'].split('\\.');
 								}
 
-								if (
-								project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")
-								)
-								{
-								project.properties['project.docker.latesttag.version']=versionArray[0]
-								+ '.' + versionArray[1] + "-SNAPSHOT-latest";
+								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";
+									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								}
 
 								println 'New Tag for docker:' +