From 61fee1cc95ab27949ed3e0e3ad6bbfa1dec82abb Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 4 Nov 2020 13:29:19 +0200 Subject: [PATCH] run UI tests with legacy transformers --- .travis.tests-stage.yml | 12 ++++++------ .travis.yml | 2 ++ scripts/dockerLimitMemory.sh | 22 ++++++++++++++-------- scripts/release.sh | 6 +----- scripts/startAlfresco.sh | 3 +-- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.travis.tests-stage.yml b/.travis.tests-stage.yml index 80406acbc0..f8f2f317a6 100644 --- a/.travis.tests-stage.yml +++ b/.travis.tests-stage.yml @@ -22,9 +22,9 @@ jobs: before_script: - | if [[ ${TRAVIS_BRANCH} == *community* ]]; then - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH .env else - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH .env fi - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false @@ -36,7 +36,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/startAlfresco.sh $ENTERPRISE_REPO_PATH .env - bash scripts/waitForAlfrescoToStart.sh - bash scripts/dockerLimitMemory.sh - sudo free -m -t @@ -66,9 +66,9 @@ jobs: install: - | if [[ ${TRAVIS_COMMIT_MESSAGE} == *"[tests on community]"* ]]; then - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH .env else - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH .env.ci fi - bash scripts/waitForAlfrescoToStart.sh - bash scripts/dockerLimitMemory.sh @@ -102,7 +102,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-ui -am install: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH .env.ci - bash scripts/waitForAlfrescoToStart.sh - bash scripts/dockerLimitMemory.sh - sudo free -m -t diff --git a/.travis.yml b/.travis.yml index ca9f205318..96bbcf2161 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,8 @@ before_cache: before_install: - "cp .travis.settings.xml $HOME/.m2/settings.xml" + - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin + - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io install: skip stages: diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh index 09f0649b46..b0a1ce64dc 100644 --- a/scripts/dockerLimitMemory.sh +++ b/scripts/dockerLimitMemory.sh @@ -7,19 +7,25 @@ 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 --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=300Mb --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}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') if [ -n "$shareContainerId" ]; then - docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId + docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId + docker stop $(docker ps -a | grep '_transform-router_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_imagemagick_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_tika_' | awk '{print $1}') + docker stop $(docker ps -a | grep '_libreoffice_' | awk '{print $1}') + else + 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=300Mb --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}') fi #stop not needed container diff --git a/scripts/release.sh b/scripts/release.sh index 4435342437..d9a13454ec 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -22,10 +22,6 @@ if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then exit 1 fi -# Docker Logins -echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin -echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io - # Check if it's a hotfix version by counting the number of dots in the version number. if [ $(echo "${RELEASE_VERSION}" | grep -o "\." | wc -l) == 3 ] && [ ${release_type} == "enterprise" ]; then @@ -41,4 +37,4 @@ mvn --batch-mode \ -DdevelopmentVersion=${DEVELOPMENT_VERSION} \ -DscmCommentPrefix="[maven-release-plugin][skip ci] " \ "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \ - release:clean release:prepare release:perform \ No newline at end of file + release:clean release:prepare release:perform diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh index b161dbde05..31f12d554e 100644 --- a/scripts/startAlfresco.sh +++ b/scripts/startAlfresco.sh @@ -3,5 +3,4 @@ set -ev cd $1 -docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} -docker-compose up -d +docker-compose --env-file $2 up -d