From 83d166639307115154e843a5dc19dff95a721354 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 01/36] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac8311739a..59d981a1c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - - echo "Enterprise Rest API Tests" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From 1e11443440da255c39457eb81362386c6d0470c6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 02/36] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d49b1f18e2..b964868b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - - echo "Enterprise Rest API Tests" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From 46694bd355015c85b88fd74405c8c597162e6c9b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 03/36] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abf50bb710..aed8a6a880 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - - echo "Enterprise Rest API Tests" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From 94c3d3c3b74628249e1d5e801d032cbe038f84cf Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 04/36] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abf50bb710..aed8a6a880 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - - echo "Enterprise Rest API Tests" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From b2a466ecc22d0dd1840c1b607507344270f4d207 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 1 Oct 2020 12:57:00 +0300 Subject: [PATCH 05/36] use enterprise installer 5.2.7.4 for enterprise rest api tests --- .travis.yml | 8 ++++---- scripts/downloadInstaller.sh | 4 ++-- travis-env-vars.yml | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b964868b91..ca7fb54e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_COMMUNITY_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -81,7 +81,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -89,7 +89,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - echo "Community UI Tests ..." @@ -97,7 +97,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - echo "Enterprise UI Tests ..." diff --git a/scripts/downloadInstaller.sh b/scripts/downloadInstaller.sh index 31812860f5..a1a14d237c 100644 --- a/scripts/downloadInstaller.sh +++ b/scripts/downloadInstaller.sh @@ -2,7 +2,7 @@ # fail script immediately on any errors in external commands and print the lines set -ev -outputFile="$TRAVIS_BUILD_DIR/$1/alf-installer.bin" +outputFile="$TRAVIS_BUILD_DIR/$2/alf-installer.bin" host="s3-eu-west-1.amazonaws.com" contentType="binary/octet-stream" dateValue=`TZ=GMT date -R` @@ -12,4 +12,4 @@ curl -H "Host: ${host}" \ -H "Date: ${dateValue}" \ -H "Content-Type: ${contentType}" \ -H "Authorization: AWS $RELEASE_AWS_ACCESS_KEY:${signature}" \ - https://${host}${S3_INSTALLER_PATH} -o ${outputFile} + https://${host}$1 -o ${outputFile} diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 497c17faad..5d76d88302 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -3,4 +3,5 @@ env: - AUTOMATION_COMMUNITY_PATH=rm-automation/rm-automation-community-rest-api - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin + - S3_COMMUNITY_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin + - S3_ENTERPRISE_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin From 5f66cd900e7c8c97337cb1d611ead3e9095f39ca Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 1 Oct 2020 15:42:07 +0300 Subject: [PATCH 06/36] small fix --- scripts/downloadInstaller.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/downloadInstaller.sh b/scripts/downloadInstaller.sh index a1a14d237c..0616b643cd 100644 --- a/scripts/downloadInstaller.sh +++ b/scripts/downloadInstaller.sh @@ -6,7 +6,7 @@ outputFile="$TRAVIS_BUILD_DIR/$2/alf-installer.bin" host="s3-eu-west-1.amazonaws.com" contentType="binary/octet-stream" dateValue=`TZ=GMT date -R` -stringToSign="GET\n\n${contentType}\n${dateValue}\n${S3_INSTALLER_PATH}" +stringToSign="GET\n\n${contentType}\n${dateValue}\n$1" signature=`echo -en ${stringToSign} | openssl sha1 -hmac $RELEASE_AWS_SECRET_KEY -binary | base64` curl -H "Host: ${host}" \ -H "Date: ${dateValue}" \ From 2c4341677657d664d2f1916d8d69f5666db934a7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 2 Oct 2020 07:29:15 +0300 Subject: [PATCH 07/36] use enterprise installer 5.2.3 for enterprise rest api tests --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 5d76d88302..3da82d46bb 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -4,4 +4,4 @@ env: - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - S3_COMMUNITY_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin - - S3_ENTERPRISE_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin + - S3_ENTERPRISE_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.3-build-00012/alfresco-content-services-installer-5.2.3-linux-x64.bin From 3b998744ddb4a770ecefe79d59b24f7dee2bd946 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 2 Oct 2020 12:11:36 +0300 Subject: [PATCH 08/36] Execute enterprise rest api tests --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d30801591..4364639645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,11 +82,12 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am install: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false - name: "Community UI Tests ..." stage: Tests before_install: From 732f747021e8a97d1fa45ffb520a6cf2d34d990d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 2 Oct 2020 15:39:15 +0300 Subject: [PATCH 09/36] corrected stage phases --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4364639645..6b8f43fad1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,17 +46,17 @@ jobs: - name: "Build AGS Enterprise" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 60 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Build AGS Benchmark" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -80,14 +80,15 @@ jobs: after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests - before_install: + install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am - install: + before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - mvn -B test -pl :alfresco-rm-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 before_install: From 392f70be18a78fdc2b52de7879633298ed33d6ee Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 5 Oct 2020 09:01:18 +0300 Subject: [PATCH 10/36] Merge pull request #1243 from Alfresco/merge-3.0/APPS-237_RunERTests_no Merge 3.0/apps 237 run er tests no # Conflicts: # rm-automation/rm-automation-enterprise-rest-api/src/test/resources/log4j.properties --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b47fe0a9ef..416caed1fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,17 +46,17 @@ jobs: - name: "Build AGS Enterprise" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 60 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Build AGS Benchmark" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -80,13 +80,15 @@ jobs: after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am + before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - - echo "Enterprise Rest API Tests" + - mvn -B test -pl :alfresco-rm-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 before_install: From b13b6f5e93a69713e3329a98d9a9fbdd10da4af7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 5 Oct 2020 09:01:18 +0300 Subject: [PATCH 11/36] Merge pull request #1243 from Alfresco/merge-3.0/APPS-237_RunERTests_no Merge 3.0/apps 237 run er tests no # Conflicts: # rm-automation/rm-automation-enterprise-rest-api/src/test/resources/log4j.properties --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b47fe0a9ef..416caed1fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,17 +46,17 @@ jobs: - name: "Build AGS Enterprise" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 60 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Build AGS Benchmark" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -80,13 +80,15 @@ jobs: after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am + before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - - echo "Enterprise Rest API Tests" + - mvn -B test -pl :alfresco-rm-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 before_install: From a40d648738c799bc08ee359e8381e269e3f217cd Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 5 Oct 2020 09:01:18 +0300 Subject: [PATCH 12/36] Merge pull request #1243 from Alfresco/merge-3.0/APPS-237_RunERTests_no Merge 3.0/apps 237 run er tests no --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfbe2acc21..6b8f43fad1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,17 +46,17 @@ jobs: - name: "Build AGS Enterprise" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 60 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Build AGS Benchmark" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -80,13 +80,15 @@ jobs: after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am + before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - - echo "Enterprise Rest API Tests" + - mvn -B test -pl :alfresco-rm-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 before_install: From 36ed6e0b86532e8dedab012644df9d77ee3d74f4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 08:54:47 +0300 Subject: [PATCH 13/36] 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 --- .travis.yml | 4 ++-- scripts/start-compose.sh | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 scripts/start-compose.sh diff --git a/.travis.yml b/.travis.yml index 6b7c3c60ca..23b4ef7dac 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/startAlfresco.sh $ENTERPRISE_REPO_PATH + bash scripts/start-compose.sh "${ENTERPRISE_REPO_PATH}/docker-compose-travis.yml" 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/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/start-compose.sh "${ENTERPRISE_REPO_PATH}/docker-compose-travis.yml" - 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 new file mode 100644 index 0000000000..5de2330d74 --- /dev/null +++ b/scripts/start-compose.sh @@ -0,0 +1,20 @@ +#!/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 From c298893ce65221ef7f204b81d1d58d0f0cc6e4d0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 09:45:35 +0300 Subject: [PATCH 14/36] 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 36ed6e0b --- .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 From 181cf91a6f8792c2ff0ccb59caacc3cfce100303 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 09:48:59 +0300 Subject: [PATCH 15/36] Try to use AWS env --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6b7c3c60ca..1714956e56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ import: - source: travis-env-vars.yml +arch: arm64-graviton2 +virt: lxd os: linux dist: xenial language: java From 041b2de72c73d9be9b822364f1311387bcac6a08 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 10:05:18 +0300 Subject: [PATCH 16/36] Route to a 'full VM' instance in AWS over Gravitation2 CPU --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1714956e56..702559c92c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis-env-vars.yml arch: arm64-graviton2 -virt: lxd +virt: vm os: linux dist: xenial language: java From 826177b75802836fdefbe17dd60543ff9d19c477 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 10:50:17 +0300 Subject: [PATCH 17/36] Revert using arch arm64-graviton2 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 702559c92c..6b7c3c60ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ import: - source: travis-env-vars.yml -arch: arm64-graviton2 -virt: vm os: linux dist: xenial language: java From a218d4b1358f36bd149ead15f099885d4fa9fd6f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 11:29:16 +0300 Subject: [PATCH 18/36] increase docker memory --- travis-env-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index aa0e1f1190..52cea7f82b 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,3 +8,4 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' + - TRAVIS_WORKER_DOCKER_MEMORY=6G From f2767f164a273a77736a6c8c6c05c8c812435f43 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 14:39:56 +0300 Subject: [PATCH 19/36] increase docker memory --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 52cea7f82b..1e7387baee 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,4 +8,4 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' - - TRAVIS_WORKER_DOCKER_MEMORY=6G + - TRAVIS_WORKER_DOCKER_MEMORY=6.5G From f8154f81e488947d4b4f8b6ff02069f2a82014ba Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 7 Oct 2020 15:38:43 +0300 Subject: [PATCH 20/36] check containers resource usage --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6b7c3c60ca..123b956d13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,6 +96,7 @@ jobs: before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh + - docker stats script: - 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 From 16f7db24b3905a263d920fc15e7c21b1098f12dc Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 8 Oct 2020 07:40:36 +0300 Subject: [PATCH 21/36] Revert "check containers resource usage" This reverts commit f8154f81 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 123b956d13..6b7c3c60ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,6 @@ jobs: before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh - - docker stats script: - 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 From e539989a22dadf93a1c7a88f5d64700a8a4d9c51 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 8 Oct 2020 10:02:00 +0300 Subject: [PATCH 22/36] increase docker memory --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 1e7387baee..531530d8a0 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,4 +8,4 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' - - TRAVIS_WORKER_DOCKER_MEMORY=6.5G + - TRAVIS_WORKER_DOCKER_MEMORY=7G From 90c371d97c0f7d0574e06504ee4e33df959d288d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 8 Oct 2020 13:19:06 +0300 Subject: [PATCH 23/36] increase docker memory --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 531530d8a0..db879fd04b 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,4 +8,4 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' - - TRAVIS_WORKER_DOCKER_MEMORY=7G + - TRAVIS_WORKER_DOCKER_MEMORY=7.5G From c915c88f4176c5cfc72e4262b040a6add1425435 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 8 Oct 2020 15:16:09 +0300 Subject: [PATCH 24/36] decrease docker memory --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index db879fd04b..52ad7fa47a 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,4 +8,4 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' - - TRAVIS_WORKER_DOCKER_MEMORY=7.5G + - TRAVIS_WORKER_DOCKER_MEMORY=6.7G From 3d829f6373938d497b98d111204d735f434fccda Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 9 Oct 2020 09:46:11 +0300 Subject: [PATCH 25/36] added sudo required --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b7c3c60ca..f4c8121698 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 From 0c279a3870c2421e2b06411589ca19840982474c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 9 Oct 2020 13:38:23 +0300 Subject: [PATCH 26/36] limit memory for running containers --- .travis.yml | 16 +++++++++++++++- travis-env-vars.yml | 1 - 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4c8121698..b88312efff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,8 +96,22 @@ jobs: before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh + - docker stats --no-stream + - docker update --memory=2Gb --memory-swap -1 rm-enterprise-repo_alfresco_1 + - docker update --memory=1.5Gb --memory-swap -1 rm-enterprise-repo_search_1 + - docker update --memory=1Gb --memory-swap -1 rm-enterprise-repo_zeppelin_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_postgres_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_transform-router_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_imagemagick_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_alfresco-pdf-renderer_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_shared-file-store_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_tika_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_libreoffice_1 + - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_activemq_1 + - docker stats --no-stream + - sudo free -m -t script: - - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false + - travis_wait 30 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/travis-env-vars.yml b/travis-env-vars.yml index 52ad7fa47a..aa0e1f1190 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,4 +8,3 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' - - TRAVIS_WORKER_DOCKER_MEMORY=6.7G From 100d0361d93249615283c70db0e3e28caa42ac3e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 9 Oct 2020 15:54:55 +0300 Subject: [PATCH 27/36] fix containers names --- .travis.yml | 14 +------------- scripts/dockerLimitMemory.sh | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 scripts/dockerLimitMemory.sh diff --git a/.travis.yml b/.travis.yml index b88312efff..4d6f6841ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,19 +96,7 @@ jobs: before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh - - docker stats --no-stream - - docker update --memory=2Gb --memory-swap -1 rm-enterprise-repo_alfresco_1 - - docker update --memory=1.5Gb --memory-swap -1 rm-enterprise-repo_search_1 - - docker update --memory=1Gb --memory-swap -1 rm-enterprise-repo_zeppelin_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_postgres_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_transform-router_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_imagemagick_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_alfresco-pdf-renderer_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_shared-file-store_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_tika_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_libreoffice_1 - - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_activemq_1 - - docker stats --no-stream + - bash scripts/dockerLimitMemory.sh - sudo free -m -t script: - travis_wait 30 mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false 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 ef8a44a5c97184bc64cc50114c81a722b61b6927 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 9 Oct 2020 18:24:28 +0300 Subject: [PATCH 28/36] increase memory limit --- scripts/dockerLimitMemory.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index b77c9c5764..ee810fabd5 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -5,8 +5,8 @@ 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=2.5Gb --memory-swap -1 $(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=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}') From b0cb61f22b43bc33d337fe1469326dd87725a074 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 10 Oct 2020 18:34:50 +0300 Subject: [PATCH 29/36] update travis wait to 90 min --- .travis.yml | 2 +- scripts/dockerLimitMemory.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d6f6841ed..f57d528870 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,7 @@ jobs: - bash scripts/dockerLimitMemory.sh - sudo free -m -t script: - - travis_wait 30 mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false + - travis_wait 90 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 ee810fabd5..04dd47bfb4 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -8,11 +8,11 @@ docker stats --no-stream docker update --memory=2.5Gb --memory-swap -1 $(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=512Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}') +docker update --memory=256Mb --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=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 '_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}') From ec66d90113f443bb94714512e9f01e5d92bb4198 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 10 Oct 2020 19:03:53 +0300 Subject: [PATCH 30/36] restart alfresco on failure --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 04dd47bfb4..e0314c211d 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -5,7 +5,7 @@ set -x docker stats --no-stream #limit memory used by each container -docker update --memory=2.5Gb --memory-swap -1 $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +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}') From 887510c6059de652b8e99d8dc20f0ae97b0767dc Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sun, 11 Oct 2020 11:10:07 +0300 Subject: [PATCH 31/36] 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 From 979090becf75136115216e2d02ae4a3702fb9ab4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 12 Oct 2020 09:53:32 +0300 Subject: [PATCH 32/36] set memory limit for postgres container to 256 Mb --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 6ceb82c2dc..d4979e1304 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -8,7 +8,7 @@ docker stats --no-stream 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=256Mb --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}') From 91e038d4e537458790bfa5427001c6692bc5eefe Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 12 Oct 2020 14:49:10 +0300 Subject: [PATCH 33/36] restart containers on failures --- scripts/dockerLimitMemory.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index d4979e1304..965519f354 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -6,16 +6,16 @@ docker stats --no-stream #limit memory used by each container 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=1.5Gb --memory-swap -1 --restart on-failure $(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=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}') +docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') +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=512Mb --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}') +docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}') #stop not needed container docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}') From 984d1e87877371c49a0429233abd3002001fbb63 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 12 Oct 2020 15:00:16 +0300 Subject: [PATCH 34/36] decreased insight engine memory limit --- scripts/dockerLimitMemory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 965519f354..cdb1dbdd5d 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -6,7 +6,7 @@ docker stats --no-stream #limit memory used by each container docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') -docker update --memory=1.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(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 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-router_' | awk '{print $1}') From 1909df132a7cce3b3ea034a89d3da69392da2c68 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 12 Oct 2020 17:12:38 +0300 Subject: [PATCH 35/36] Merge pull request #1245 from Alfresco/merge-3.1/APPS-237_RunERTests_no Merge 3.1/apps 237 run er tests no # Conflicts: # rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/search/sql/SQLSearchClassifiedDocumentsTests.java # rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/search/sql/SQLSearchRecordCategoryTests.java # rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/search/sql/SQLSearchSecuredDocumentsTests.java --- .travis.yml | 16 ++++++++++------ scripts/dockerLimitMemory.sh | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 scripts/dockerLimitMemory.sh diff --git a/.travis.yml b/.travis.yml index b4fd36033b..5113a3086b 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 @@ -46,17 +46,17 @@ jobs: - name: "Build AGS Enterprise" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 60 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Build AGS Benchmark" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -90,13 +90,17 @@ jobs: after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am install: + - 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 - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t script: - - echo "Enterprise Rest API Tests" + - 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 before_install: diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh new file mode 100644 index 0000000000..cdb1dbdd5d --- /dev/null +++ b/scripts/dockerLimitMemory.sh @@ -0,0 +1,24 @@ +#!/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 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(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 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') +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=512Mb --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}') +docker update --memory=512Mb --memory-swap -1 --restart on-failure $(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 b1f565543dbeb625d9571a17dcbedecd0c9cd552 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 12 Oct 2020 17:12:38 +0300 Subject: [PATCH 36/36] Merge pull request #1245 from Alfresco/merge-3.1/APPS-237_RunERTests_no Merge 3.1/apps 237 run er tests no # Conflicts: # .travis.yml # rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/search/sql/SQLSearchSecuredDocumentsTests.java --- .travis.yml | 16 ++++++++++------ scripts/dockerLimitMemory.sh | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 scripts/dockerLimitMemory.sh diff --git a/.travis.yml b/.travis.yml index 77dc6e60d5..a102bf4757 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 @@ -46,17 +46,17 @@ jobs: - name: "Build AGS Enterprise" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Build AGS Benchmark" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -90,13 +90,17 @@ jobs: after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am install: + - 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 - bash scripts/waitForAlfrescoToStart.sh + - bash scripts/dockerLimitMemory.sh + - sudo free -m -t script: - - echo "Enterprise Rest API Tests" + - 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 before_install: diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh new file mode 100644 index 0000000000..cdb1dbdd5d --- /dev/null +++ b/scripts/dockerLimitMemory.sh @@ -0,0 +1,24 @@ +#!/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 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}') +docker update --memory=1200Mb --memory-swap -1 --restart on-failure $(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 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}') +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=512Mb --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}') +docker update --memory=512Mb --memory-swap -1 --restart on-failure $(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