inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/merge-3.0/APPS-238_APPS-104_no' into merge-3.0/APPS-238_APPS-104_no

Browse Source
This commit is contained in:
ehardon
2020-10-27 08:42:26 +02:00
parent 88b235b7c3 f569a47b42
commit 207474e7cf
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@@ -1,7 +1,7 @@
import: import:
- source: travis-env-vars.yml - source: travis-env-vars.yml
os: linux
dist: xenial dist: xenial
sudo: required
language: java language: java
jdk: jdk:
- openjdk11 - openjdk11
@@ -75,8 +75,7 @@ jobs:
stage: Tests stage: Tests
install: 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 travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am
else else
travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am 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 - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-community-rest-api -am
before_script: 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 bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH
else else
bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH
@@ -119,7 +118,7 @@ jobs:
target_paths: $TRAVIS_BUILD_NUMBER target_paths: $TRAVIS_BUILD_NUMBER
before_install: before_install:
- | - |
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 travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am
else else
travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am
@@ -127,7 +126,7 @@ jobs:
- travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-ui -am
install: install:
- | - |
if [[ ${TRAVIS_COMMIT_MESSAGE} =~ '"[tests on community]"' ]]; then if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then
bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH
else else
bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH
@@ -164,6 +163,8 @@ jobs:
install: install:
- bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH
- bash scripts/waitForAlfrescoToStart.sh - bash scripts/waitForAlfrescoToStart.sh
- bash scripts/dockerLimitMemory.sh
- sudo free -m -t
script: 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} - 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}

23
scripts/dockerLimitMemory.sh Normal file
View File

@@ -0,0 +1,23 @@
#!/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 $(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 '_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 '_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}')
# Display containers resources usage after limitation
docker stats --no-stream