diff --git a/.travis.tests-stage.yml b/.travis.tests-stage.yml index f8f2f317a6..b066fc9b2e 100644 --- a/.travis.tests-stage.yml +++ b/.travis.tests-stage.yml @@ -22,9 +22,9 @@ jobs: before_script: - | if [[ ${TRAVIS_BRANCH} == *community* ]]; then - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH .env + bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH false else - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH .env + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH false fi - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false @@ -36,7 +36,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/startAlfresco.sh $ENTERPRISE_REPO_PATH .env + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH false - bash scripts/waitForAlfrescoToStart.sh - bash scripts/dockerLimitMemory.sh - sudo free -m -t @@ -66,9 +66,9 @@ jobs: install: - | if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH .env + bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH false else - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH .env.ci + bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH true fi - bash scripts/waitForAlfrescoToStart.sh - bash scripts/dockerLimitMemory.sh @@ -102,7 +102,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-ui -am install: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH .env.ci + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH true - bash scripts/waitForAlfrescoToStart.sh - bash scripts/dockerLimitMemory.sh - sudo free -m -t diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh index 31f12d554e..4e5f88e36c 100644 --- a/scripts/startAlfresco.sh +++ b/scripts/startAlfresco.sh @@ -3,4 +3,9 @@ set -ev cd $1 -docker-compose --env-file $2 up -d +# if 2nd input parameter is true then use legacy transformers +# (flags LOCAL_TRANSFORM_SERVICE_ENABLED and TRANSFORM_SERVICE_ENABLED are set to false in .env.ci ) +if $2 ; then + mv -u .env.ci .env +fi +docker-compose up -d