remove commented code and limit memory for docker containers only on enterprise

This commit is contained in:
Claudia Agache
2020-11-05 08:33:38 +02:00
parent c761127211
commit 116ceabde3
3 changed files with 6 additions and 13 deletions

View File

@@ -60,13 +60,14 @@ jobs:
if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then
travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am
bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH false
bash scripts/waitForAlfrescoToStart.sh
else
travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am
bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH true
bash scripts/waitForAlfrescoToStart.sh
bash scripts/dockerLimitMemory.sh
sudo free -m -t
fi
- bash scripts/waitForAlfrescoToStart.sh
- bash scripts/dockerLimitMemory.sh
- sudo free -m -t
- travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-ui -am
script:
- travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-governance-services-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS}

View File

@@ -18,18 +18,10 @@ shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}')
if [ -n "$shareContainerId" ]; then
docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId
docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}')
# docker stop $(docker ps -a | grep '_imagemagick_' | awk '{print $1}')
# docker stop $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}')
docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}')
# docker stop $(docker ps -a | grep '_tika_' | awk '{print $1}')
# docker stop $(docker ps -a | grep '_libreoffice_' | awk '{print $1}')
else
docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-router_' | awk '{print $1}')
# docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_imagemagick_' | awk '{print $1}')
# docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}')
docker update --memory=300Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}')
# docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_tika_' | awk '{print $1}')
# docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_libreoffice_' | awk '{print $1}')
fi
#stop not needed container

View File

@@ -3,8 +3,8 @@
set -ev
cd $1
# 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 2nd input parameter is true then use .env.ci where TRANSFORM_SERVICE_ENABLED flag is set to false
# in order to not use anymore Transform router and Shared File Store
if $2 ; then
mv -u .env.ci .env
fi