X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fdgbuilder%2Fpom.xml;h=2bd1f1f7fe1c100d72e8e2bed718ec85facad93f;hb=bd040b5ca256a803cbf5c01802b7d1bf967f6fb5;hp=f7a6375d00e1b2724a3864c96c7954ee515ab739;hpb=c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b;p=sdnc%2Foam.git

diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index f7a6375d..2bd1f1f7 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -3,22 +3,23 @@
 	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-dgbuilder</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<name>Installation - dgbuilder</name>
 	<description>Creates docker container for dgbuilder</description>
 
 	<properties>
-		<image.name>openecomp/dgbuilder-sdnc-image</image.name>
+		<image.name>onap/dgbuilder-sdnc-image</image.name>
+		<sdnc.project.version>${project.version}</sdnc.project.version>
 	</properties>
 
 
@@ -26,6 +27,37 @@
 		<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>
@@ -42,7 +74,8 @@
 								<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
 								<tags>
 									<tag>${project.version}</tag>
-									<tag>latest</tag>
+									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
 							</build>
 						</image>
@@ -51,7 +84,7 @@
 				<executions>
 					<execution>
 						<id>generate-images</id>
-						<phase>generate-sources</phase>
+						<phase>package</phase>
 						<goals>
 							<goal>build</goal>
 						</goals>
@@ -98,6 +131,20 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<version>1.5.0</version>
 				<executions>
+                    			<execution>
+                        			<id>Make-stage-dir</id>
+                        			<phase>generate-sources</phase>
+                        			<goals>
+                            				<goal>exec</goal>
+                        			</goals>
+                        			<configuration>
+                            				<executable>/bin/mkdir</executable>
+                            				<arguments>
+                                			<argument>-p</argument>
+                                			<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
+                            				</arguments>
+                        			</configuration>
+                    			</execution>
                     			<execution>
                         			<id>Unzip dgbuilder</id>
                         			<phase>generate-sources</phase>
@@ -108,7 +155,7 @@
                             				<executable>/usr/bin/unzip</executable>
                             				<arguments>
                                 			<argument>-d</argument>
-                                			<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+                                			<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
                                 			<argument>../../dgbuilder/target/*.zip</argument>
                             				</arguments>
                         			</configuration>
@@ -124,7 +171,7 @@
 							<arguments>
 								<argument>-r</argument>
 								<argument>../../dgbuilder</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
 							</arguments>
 						</configuration>
 					</execution>
@@ -138,7 +185,7 @@
 						<configuration>
 							<executable>/bin/bash</executable>
 							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir.sh</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc/dgbuilder/createReleaseDir.sh</argument>
 								<argument>1702</argument>
 								<argument>dguser</argument>
 								<argument>change_email_id@dgbuilder.com</argument>
@@ -155,7 +202,7 @@
 						<configuration>
 							<executable>/usr/bin/find</executable>
 							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
 								<argument>-name</argument>
 								<argument>*.sh</argument>
 								<argument>-exec</argument>