X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fadmportal%2Fpom.xml;h=4306803fd7b50fc2e9e9558208d6c18af2bffabd;hb=bd040b5ca256a803cbf5c01802b7d1bf967f6fb5;hp=1f5c420177004d41517ca5796b63019b30fe9573;hpb=3be2dec90f877dbca6c9663410053ae7dd229179;p=sdnc%2Foam.git
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 1f5c4201..4306803f 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/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">
- org.openecomp.sdnc.oam
+ org.onap.sdnc.oam
installation
- 1.1.0-SNAPSHOT
+ 1.2.2-SNAPSHOT
4.0.0
pom
- org.openecomp.sdnc.oam
+ org.onap.sdnc.oam
installation-admportal
- 1.1.0-SNAPSHOT
+ 1.2.2-SNAPSHOT
Installation - admportal
Creates admportal Docker container
- openecomp/admportal-sdnc-image
+ onap/admportal-sdnc-image
${project.version}
@@ -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:' +
@@ -77,6 +72,7 @@
${basedir}/target/docker-stage
${basedir}/target/docker-stage/Dockerfile
+ ${project.version}
${project.version}-STAGING-${maven.build.timestamp}
${project.docker.latesttag.version}
@@ -134,7 +130,7 @@
validate
- ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties
+ ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties
../src/main/properties
@@ -164,7 +160,7 @@
/usr/bin/unzip
-d
- ${basedir}/target/docker-stage/opt/openecomp/sdnc
+ ${basedir}/target/docker-stage/opt/onap/sdnc
../../admportal/target/*.zip
@@ -180,7 +176,7 @@
/bin/cp
../../admportal/config/admportal.json
- ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties
+ ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties
@@ -195,7 +191,7 @@
/bin/cp
../../admportal/config/admportal.log4js.json
- ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties
+ ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties
@@ -210,7 +206,7 @@
/usr/bin/find
- ${basedir}/target/docker-stage/opt/openecomp/sdnc
+ ${basedir}/target/docker-stage/opt/onap/sdnc
-name
*.sh
-exec