Merge "Replicate demo/boot/portal_vm_init.sh"
diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh
index b05e0a2..19a1e0e 100755
--- a/deliveries/os_settings.sh
+++ b/deliveries/os_settings.sh
@@ -3,17 +3,17 @@
# These variables are ALSO used in demo/boot/portal_vm_init.sh
EP_TAG_NAME=portalapps
-EP_IMG_NAME=ep:latest
+EP_IMG_NAME=portalapps:latest
EP_CONT_NAME=onap_portal
DB_TAG_NAME=portaldb
-DB_IMG_NAME=ecompdb:portal
-DB_CONT_NAME=ecompdb_portal
+DB_IMG_NAME=portaldb:latest
+DB_CONT_NAME=onap_portal_db
DB_VOL_NAME=data_vol_portal
WMS_TAG_NAME=portalwms
WMS_IMG_NAME=widget-ms
-WMS_CONT_NAME=ecomp-portal-widget-ms
+WMS_CONT_NAME=onap_portal_widget_ms
VERSION=1.1.0
ETCDIR=etc
diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 2cf1af2..d00d47a 100644
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -4,7 +4,6 @@
<groupId>org.openecomp.portal</groupId>
<artifactId>ecompportal-be-os</artifactId>
<packaging>war</packaging>
- <!-- Jenkins is not used to build the o/s version -->
<version>1.1</version>
<properties>
@@ -22,6 +21,7 @@
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+ <sitePath>/content/sites/site/org/onap/portal/${project.version}</sitePath>
</properties>
<reporting>
@@ -46,8 +46,8 @@
</reporting>
<distributionManagement>
<site>
- <id>nexus</id>
- <url>dav:https://ecomp-nexus:8443/repository/portal-javadoc/${epsdk.version}</url>
+ <id>ecomp-site</id>
+ <url>dav:${nexusproxy}${sitePath}</url>
</site>
</distributionManagement>
<repositories>