X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fos_build_febe.sh;h=18cfc374051bd0fe58588a5b255ff19eb038d97a;hb=d332e89eb9bbaf280604c61715422dde3542813c;hp=746b2fd4a06d1b38fc057c5ae70483c439bae972;hpb=6800e0a2123df36c40d0bd6b0c3030314dace51f;p=portal.git

diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
old mode 100644
new mode 100755
index 746b2fd4..18cfc374
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
+# Stop on error; show output
+set -e -x
 
 source $(dirname $0)/os_settings.sh
 
-export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE}"
-
+# Use -B for batch operation to skip download progress output
+export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE} -B"
+#MVN=mvn
 CURRENTDIR="$(pwd)"
 
-
 # install ecomp portal
 rm -rf $CURRENTDIR/$WORKINGDIR
 mkdir $CURRENTDIR/$WORKINGDIR 
@@ -22,50 +24,54 @@ mkdir $PROJECTDIR
 cd $CURRENTDIR
 cd ..
 
-cp -r ecomp-portal-FE $PROJECTDIR/ecomp-portal-FE
-cp -r ecomp-portal-BE $PROJECTDIR/ecomp-portal-BE
-cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/ecomp-sdk
-
-#!/bin/bash
-shopt -s expand_aliases
-source ~/.bashrc
-
-cd $PROJECTDIR/ecomp-portal-FE/
+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-BE-common $PROJECTDIR/ecomp-portal-BE-common
+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
 
+cd $PROJECTDIR/ecomp-portal-BE-common
 ${MVN} install
 
-cd $PROJECTDIR/ecomp-portal-BE
-
+cd $PROJECTDIR/ecomp-portal-BE-os
 ${MVN} install
 
-# now install sdk app
-cd $PROJECTDIR/ecomp-sdk/sdk-app
-
+cd $PROJECTDIR/ecomp-portal-FE-os/
 ${MVN} install
 
-mv target/ep-sdk-app-1.1.0-SNAPSHOT target/ep-sdk-app
+cd $PROJECTDIR/ecomp-sdk/epsdk-app-os
+${MVN} install
 
 # 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
 
-cd target
-mv dmaap-bc-app.1.1.0-SNAPSHOT.0 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
 
-echo "running: docker build -t ${IMGNAME}  --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 ."
-docker build -t ${IMGNAME}  --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 .
+PROXY_ARGS=""
+if [ $HTTP_PROXY ]; then
+    PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}"
+fi
+if [ $HTTPS_PROXY ]; then
+    PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
+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