From c11d061ccbf63db9a7fbf17ba1bae4689959d139 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 09:45:35 +0300 Subject: [PATCH] Revert "Created a light docker compose file in order to not get "No output has been received in the last 10m0s" in travis when executing tests" This reverts commit b60966a6 --- .travis.yml | 4 ++-- scripts/start-compose.sh | 20 -------------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 scripts/start-compose.sh diff --git a/.travis.yml b/.travis.yml index 23b4ef7dac..6b7c3c60ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: if [[ ${TRAVIS_BRANCH} == *community* ]]; then bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH else - bash scripts/start-compose.sh "${ENTERPRISE_REPO_PATH}/docker-compose-travis.yml" + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH fi - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false @@ -94,7 +94,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: - - bash scripts/start-compose.sh "${ENTERPRISE_REPO_PATH}/docker-compose-travis.yml" + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh deleted file mode 100644 index 5de2330d74..0000000000 --- a/scripts/start-compose.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -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+ -docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d - -if [ $? -eq 0 ] ; then - echo "Docker Compose started ok" -else - echo "Docker Compose failed to start" >&2 - exit 1 -fi