From 887510c6059de652b8e99d8dc20f0ae97b0767dc Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sun, 11 Oct 2020 11:10:07 +0300 Subject: [PATCH] remove travis_wait because build still fails with No output has been received in the last 10m0s --- .travis.yml | 2 +- scripts/dockerLimitMemory.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f57d528870..5113a3086b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,7 @@ jobs: - bash scripts/dockerLimitMemory.sh - sudo free -m -t script: - - travis_wait 90 mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false + - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Community UI Tests ..." stage: Tests diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index e0314c211d..6ceb82c2dc 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -5,17 +5,20 @@ set -x docker stats --no-stream #limit memory used by each container -docker update --memory=2.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') -docker update --memory=2Gb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') -docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') -docker update --memory=256Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') +docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') +#docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') +docker update --memory=128Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_transform-router_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') -docker update --memory=256Mb --memory-swap -1 $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') +docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_tika_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_activemq_' | awk '{print $1}') +#stop not needed container +docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') + # Display containers resources usage after limitation docker stats --no-stream