[EDELIVERY-12658] update weblogic and springboot plans

smp-docker/compose/sprinboot-mysql-smp/runCompose.sh

@@ -33,11 +33,11 @@ done
 discoverApplicationVersion
 
 echo "*************************************************************************"
-echo "SMP version: $SMP_VERSION"
-echo "Init sql data: ${SMP_INIT_DATABASE_DATA}"
-echo "Working Directory: ${WORKDIR}"
+echo "SMP version: [${SMP_VERSION}]"
+echo "Init sql data: [${SMP_INIT_DATABASE_DATA}]"
+echo "Working Directory: [${WORKDIR}]"
 echo "*************************************************************************"
-cd "$WORKDIR"
+
 export SMP_VERSION
 
 

smp-docker/compose/sprinboot-mysql-smp/stopClearCompose.sh

 #!/bin/bash
+
 WORKDIR="$(dirname $0)"
-source "${WORKDIR}/../../functions/common.functions"
+SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
+source "${SMP_PROJECT_FOLDER}/functions/common.functions"
+source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
 [ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
+cd "${WORKDIR}" || exit 100
 initializeCommonVariables
+discoverApplicationVersion
 
-# clear volume and containers - to run  restart from scratch
-function clearOldContainers {
-  echo "Save docker log to docker-file"
-  docker logs "${PLAN_PREFIX}" > smp-container.log 2>&1
-  echo "Clear containers and volumes"
-  docker-compose -p "${PLAN_PREFIX}" rm -s -f -v
-}
-
-# stop and clear  
-clearOldContainers
+echo "Clear old containers"
+stopAndClearTestContainers

smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh

@@ -29,9 +29,9 @@ done
 discoverApplicationVersion
 
 echo "*****************************************************************"
-echo "* Start SMP image for version: $SMP_VERSION"
-echo "* Plan prefix: ${PLAN_PREFIX}"
-echo "* WORKDIR: ${WORKDIR}"
+echo "* Start SMP image for version: [$SMP_VERSION]"
+echo "* Plan prefix: [${PLAN_PREFIX}]"
+echo "* WORKDIR: [${WORKDIR}]"
 echo "*****************************************************************"
 echo ""
 # export plan variables

smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh

 #!/bin/bash
 
 WORKDIR="$(dirname $0)"
-source "${WORKDIR}/../../functions/common.functions"
+SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
+source "${SMP_PROJECT_FOLDER}/functions/common.functions"
+source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
 [ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
+cd "${WORKDIR}" || exit 100
 initializeCommonVariables
+discoverApplicationVersion
 
-# clear volume and containers - to run  restart from scratch
-function clearOldContainers {
-  echo "Save docker log to docker-file"
-  docker logs "${PLAN_PREFIX}-domismp-service_1" > smp-container.log 2>&1
-  echo "Clear containers and volumes"
-  docker-compose -p "${PLAN_PREFIX}" rm -s -f -v
-}
-
-# stop and clear  
-clearOldContainers
+echo "Clear old containers"
+stopAndClearTestContainers
 

smp-docker/compose/weblogic-oracle/stopClearCompose.sh

 #!/bin/bash
 
 WORKDIR="$(dirname $0)"
-source "${WORKDIR}/../../functions/common.functions"
+SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
+source "${SMP_PROJECT_FOLDER}/functions/common.functions"
+source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
 [ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
+cd "${WORKDIR}" || exit 100
 initializeCommonVariables
+discoverApplicationVersion
 
-# clear volume and containers - to run  restart from scratch
-function clearOldContainers {
-  echo "Save docker log to docker-file"
-  docker logs > smp-container.log 2>&1
-  echo "Clear containers and volumes"
-  docker-compose -p "${PLAN_PREFIX}" rm -s -f -v
-}
-
-# stop and clear
-clearOldContainers
+echo "Clear old containers"
+stopAndClearTestContainers

smp-docker/compose/weblogic-oracle14/stopClearCompose.sh

 #!/bin/bash
 
 WORKDIR="$(dirname $0)"
-source "${WORKDIR}/../../functions/common.functions"
+SMP_PROJECT_FOLDER=$(readlink -e "${WORKDIR}/../../..")
+source "${SMP_PROJECT_FOLDER}/functions/common.functions"
+source "${SMP_PROJECT_FOLDER}/smp-docker/functions/run-test.functions"
 [ -f "${WORKDIR}/.env" ] && source "${WORKDIR}/.env"
+cd "${WORKDIR}" || exit 100
 initializeCommonVariables
+discoverApplicationVersion
 
-# clear volume and containers - to run  restart from scratch
-function clearOldContainers {
-  echo "Save docker log to docker-file"
-  docker logs > smp-container.log 2>&1
-  echo "Clear containers and volumes"
-  docker-compose -p "${PLAN_PREFIX}" rm -s -f -v
-}
-
-# stop and clear  
-clearOldContainers
-
+echo "Clear old containers"
+stopAndClearTestContainers

smp-docker/functions/run-test.functions

@@ -16,7 +16,7 @@ function stopAndClearTestContainers() {
 ################################################################
 # Function exports the logs to file and stop and clear containers
 function startTestContainers() {
-  echo "Save docker log to docker-file"
+  echo "Start containers with prefix ${PLAN_PREFIX}"
   docker compose -p "${PLAN_PREFIX}" up -d --force-recreate --wait --wait-timeout 300
 }
 

smp-docker/images/build-docker-images.sh

@@ -63,11 +63,11 @@ done
 discoverApplicationVersion
 
 echo "*****************************************************************"
-echo "* SMP artefact folders: $SMP_ARTEFACTS, (Clear folder after build: $SMP_ARTEFACTS_CLEAR )"
-echo "* SMP artefact springboot folders: $SMP_SPRINGBOOT_ARTEFACTS"
-echo "* SMP Plugin example: $SMP_PLUGIN_EXAMPLE "
-echo "* Build SMP image for version $SMP_VERSION"
-echo "* Oracle artefact folders: $ORACLE_ARTEFACTS"
+echo "* SMP artefact folders: [$SMP_ARTEFACTS], (Clear folder after build: [$SMP_ARTEFACTS_CLEAR] )"
+echo "* SMP artefact springboot folders: [$SMP_SPRINGBOOT_ARTEFACTS]"
+echo "* SMP Plugin example: [$SMP_PLUGIN_EXAMPLE] "
+echo "* Build SMP image for version [$SMP_VERSION]"
+echo "* Oracle artefact folders: [$ORACLE_ARTEFACTS]"
 echo "*****************************************************************"
 echo ""
 

smp-docker/images/tomcat-mysql-smp-sml/Dockerfile

@@ -141,7 +141,7 @@ RUN unzip /tmp/artefacts/smp-setup.zip -d /tmp/    \
     && chmod u+x /sbin/entrypoint.sh
 
 
-HEALTHCHECK --interval=20s --timeout=5s \
+HEALTHCHECK --interval=20s --timeout=10s --start-period=60s --retries=5 \
   CMD curl -f http://localhost:8080/smp/ || exit 1
 
 ENTRYPOINT ["/sbin/entrypoint.sh"]