From 606d21d2c12d8fbf70066478c9d8205d46a8053c Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Thu, 20 Aug 2020 18:46:46 +0300
Subject: [PATCH] delete duplicate code

---
 .travis.yml                  |  3 ++-
 scripts/start-compose.sh     | 32 --------------------------------
 scripts/worm-mb-start-env.sh | 13 -------------
 3 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 scripts/worm-mb-start-env.sh

diff --git a/.travis.yml b/.travis.yml
index b7577c7db0..0fcb130bdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,8 @@ jobs:
         - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am
       before_script:
         - bash scripts/create-worm-bucket.sh
-        - bash scripts/worm-mb-start-env.sh
+        - bash scripts/start-compose.sh "${PWD}/${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml"
+        - bash scripts/waitForAlfrescoToStart.sh
       script:
         - cd $AUTOMATION_ENTERPRISE_PATH
         - mvn -B -U test -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false
diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh
index 1ed30248d4..af3b2272b8 100644
--- a/scripts/start-compose.sh
+++ b/scripts/start-compose.sh
@@ -12,13 +12,6 @@ if [ -n "${S3_BUCKET_NAME}" ] ; then
   export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}"
 fi
 
-export DOCKER_COMPOSE_PATH=$1
-
-if [ -z "$DOCKER_COMPOSE_PATH" ] ; then
-  echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\""
-  exit 1
-fi
-
 echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}"
 
 # .env files are picked up from project directory correctly on docker-compose 1.23.0+
@@ -30,28 +23,3 @@ else
   echo "Docker Compose failed to start" >&2
   exit 1
 fi
-
-WAIT_INTERVAL=1
-COUNTER=0
-TIMEOUT=300
-t0=`date +%s`
-
-echo "Waiting for alfresco to start"
-until $(curl --output /dev/null --silent --head --fail http://localhost:8080/alfresco) || [ "$COUNTER" -eq "$TIMEOUT" ]; do
-   printf '.'
-   sleep $WAIT_INTERVAL
-   COUNTER=$(($COUNTER+$WAIT_INTERVAL))
-done
-
-if (("$COUNTER" < "$TIMEOUT")) ; then
-   t1=`date +%s`
-   delta=$((($t1 - $t0)/60))
-   echo "Alfresco Started in $delta minutes"
-else
-   echo "Waited $COUNTER seconds"
-   echo "Alfresco Could not start in time."
-   exit 1
-fi
-
-echo "Wait onther 30 seconds..."
-sleep 30
diff --git a/scripts/worm-mb-start-env.sh b/scripts/worm-mb-start-env.sh
deleted file mode 100644
index b6d6f77eb5..0000000000
--- a/scripts/worm-mb-start-env.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-echo "=========================== Starting MB Env Script ==========================="
-PS4="\[\e[35m\]+ \[\e[m\]"
-set -vex
-pushd "$(dirname "${BASH_SOURCE[0]}")/../"
-
-
-bash scripts/start-compose.sh "${PWD}/${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml"
-
-popd
-set +vex
-echo "=========================== Finishing MB Env Script =========================="