Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge-3.4/APPS-237_RunERTests_no

# Conflicts:
#	.travis.yml

.travis.yml

@@ -79,6 +79,7 @@ jobs:
       stage: Tests
       script:
         - echo "Enterprise Integrations Tests on MySQL"
+
     - name: "Community Rest API Tests"
       stage: Tests
       install:
@@ -99,15 +100,20 @@ jobs:
         - bash scripts/waitForAlfrescoToStart.sh
       script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false
       after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000
+
     - name: "Enterprise Rest API Tests"
       stage: Tests
       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: "Enterprise Rest API WORM Tests"
       stage: Tests

scripts/dockerLimitMemory.sh

@@ -0,0 +1,26 @@
+#!/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}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-misc_' | awk '{print $1}')
+
+#stop not needed containers
+docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}')
+docker stop $(docker ps -a | grep '_sync-service_' | awk '{print $1}')
+
+# Display containers resources usage after limitation
+docker stats --no-stream