X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fos_build_febe.sh;h=d9a59bf15000a95ebde7e6be485873a6b33ae23c;hb=a0b9152f19c4f8dbd925635129d75af9785a1d4a;hp=2d6117c3b3d8667e15c0055098e27b038a1c2475;hpb=fec1ab242c9086a32b04e3ded4518dd20eeca7d3;p=portal.git

diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
index 2d6117c3..d9a59bf1 100755
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@ -1,13 +1,21 @@
 #!/bin/bash
+# Builds docker with three webapps: portal app, portal-sdk app, dbc app
+# Stop on error; show output
+set -e -x
 
 source $(dirname $0)/os_settings.sh
 
-export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE}"
-#export MVN="mvn"
+# Work standalone and in Jenkins.
+# Pick up Jenkins settings for this script.
+# Use -B for batch operation to skip download progress output
+if [ -n "$MVN" ]; then
+    export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE} -B"
+else
+    MVN=mvn
+fi
 
 CURRENTDIR="$(pwd)"
 
-
 # install ecomp portal
 rm -rf $CURRENTDIR/$WORKINGDIR
 mkdir $CURRENTDIR/$WORKINGDIR 
@@ -24,63 +32,42 @@ cd $CURRENTDIR
 cd ..
 
 cp -r ecomp-portal-FE-common $PROJECTDIR/ecomp-portal-FE-common
-cp -r ecomp-portal-FE-os $PROJECTDIR/ecomp-portal-FE-os
+cp -r ecomp-portal-FE-os     $PROJECTDIR/ecomp-portal-FE-os
 cp -r ecomp-portal-BE-common $PROJECTDIR/ecomp-portal-BE-common
-cp -r ecomp-portal-BE-os $PROJECTDIR/ecomp-portal-BE-os
+cp -r ecomp-portal-BE-os     $PROJECTDIR/ecomp-portal-BE-os
 cp -r ecomp-portal-DB-common $PROJECTDIR/ecomp-portal-DB-common
-cp -r ecomp-portal-DB-os $PROJECTDIR/ecomp-portal-DB-os
-
-cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/ecomp-sdk
-
-#!/bin/bash
-shopt -s expand_aliases
-source ~/.bashrc
-
-cd $PROJECTDIR/ecomp-portal-FE-os/
-
-${MVN} clean install
+cp -r ecomp-portal-DB-os     $PROJECTDIR/ecomp-portal-DB-os
+cp -r sdk/ecomp-sdk          $PROJECTDIR/ecomp-sdk
 
 cd $PROJECTDIR/ecomp-portal-BE-common
-
 ${MVN} install
 
-
 cd $PROJECTDIR/ecomp-portal-BE-os
-
 ${MVN} install
 
+cd $PROJECTDIR/ecomp-portal-FE-os/
+${MVN} install
 
-# now install sdk app
 cd $PROJECTDIR/ecomp-sdk/epsdk-app-os
-
 ${MVN} install
 
-mv target/epsdk-app-os-1.1.0-SNAPSHOT target/ep-sdk-app
-
 # now install DBC app
 cd $SOURCEDIR
 DBCDIR=$SOURCEDIR/ST_DBPA 
 mkdir $DBCDIR
-
 #copy DBC project
 cd $CURRENTDIR
 cd ..
-
 cp -r dmaapbc/dcae_dmaapbc_webapp $DBCDIR/dcae_dmaapbc_webapp
-
 cd $DBCDIR/dcae_dmaapbc_webapp
-
 ${MVN} install
-
 cd dbca-os/target
-
-mv  dmaap-bc-app-os-1.1.0-SNAPSHOT ep-dbc-app
+mv dmaap-bc-app-os ep-dbc-app
 
 # Build complete database script in the "OS" script area
 cd ../db-scripts
 cat dbca-create-mysql-1707-os.sql ../../dbca-common/db-scripts/dbca-ddl-mysql-1707-common.sql dbca-dml-mysql-1707-os.sql > dbca-complete-mysql-1707-os.sql
 
-
 # install into docker
 cd $CURRENTDIR
 
@@ -94,4 +81,4 @@ fi
 
 EXEC_CMD="docker build -t ${IMGNAME} ${PROXY_ARGS} --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR}  --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR}  --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile ."
 echo $EXEC_CMD
-$EXEC_CMD
\ No newline at end of file
+$EXEC_CMD