From 445a4f62c84f0fdaec48bd16bca690904e92f61e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 9 Oct 2020 15:54:55 +0300 Subject: [PATCH 1/5] fix containers names (cherry picked from commit 100d0361d93249615283c70db0e3e28caa42ac3e) --- .travis.yml | 4 +++- scripts/dockerLimitMemory.sh | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 scripts/dockerLimitMemory.sh diff --git a/.travis.yml b/.travis.yml index b8ee4ff1cc..696f97e315 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis-env-vars.yml -os: linux dist: xenial +sudo: required language: java jdk: - openjdk11 @@ -164,6 +164,8 @@ jobs: install: - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-rm-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh new file mode 100644 index 0000000000..b77c9c5764 --- /dev/null +++ b/scripts/dockerLimitMemory.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +set -x + +# Display containers resources usage before limitation +docker stats --no-stream + +#limit memory used by each container +docker update --memory=2Gb --memory-swap -1 $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1.5Gb --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=512Mb --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=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}') + +# Display containers resources usage after limitation +docker stats --no-stream From 951bfa3dae2b776e84b4c1da0f580870cc72a854 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sun, 11 Oct 2020 11:10:07 +0300 Subject: [PATCH 2/5] remove not needed containers --- scripts/dockerLimitMemory.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index b77c9c5764..be9ca3fd48 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -5,17 +5,15 @@ set -x docker stats --no-stream #limit memory used by each container -docker update --memory=2Gb --memory-swap -1 $(docker ps -a | grep '_alfresco_' | awk '{print $1}') -docker update --memory=1.5Gb --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=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}') docker update --memory=512Mb --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=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 From c3d3f90fbc88846ee12b07bd21585ad12ca55cd3 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 14:25:05 +0200 Subject: [PATCH 3/5] limit share memory --- scripts/dockerLimitMemory.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index be9ca3fd48..c9c6527983 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -12,6 +12,10 @@ docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagic docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') +shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') +if [ -n "$shareContainerId" ]; then + docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId +fi #stop not needed container docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') From e19a01587e85851ebbc6cf3ae5ca5bffcc331045 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 14:30:33 +0200 Subject: [PATCH 4/5] check [tests on community] --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 696f97e315..289b23d67e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,6 +119,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - | + echo ${TRAVIS_COMMIT_MESSAGE} if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am else From f569a47b4270dc9005ba12b567b64944b0f667e9 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 26 Oct 2020 15:15:11 +0200 Subject: [PATCH 5/5] test again [tests on community] --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 289b23d67e..5a44e7a05f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,8 +75,7 @@ jobs: stage: Tests install: - | - echo ${TRAVIS_COMMIT_MESSAGE} - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am @@ -84,7 +83,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am before_script: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH @@ -119,8 +118,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - | - echo ${TRAVIS_COMMIT_MESSAGE} - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am else travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am @@ -128,7 +126,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am install: - | - if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then + if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH else bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH