From 3be0ce1e14b4013c0b4536802afcf22793a897c2 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 16 Jul 2020 12:33:40 +0300 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-235_SetupEnv_no # Conflicts: # .travis.yml --- .travis.yml | 26 ++++++++++++++++++++++++-- scripts/startAlfresco.sh | 7 +++++++ travis-env-vars.yml | 10 ++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 scripts/startAlfresco.sh create mode 100644 travis-env-vars.yml diff --git a/.travis.yml b/.travis.yml index 9ba0c29c3a..3763494bce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +import: + - source: travis-env-vars.yml os: linux dist: xenial language: java @@ -47,7 +49,7 @@ jobs: before_script: source scripts/setUpMavenPhase.sh install: - travis_retry travis_wait 30 mvn -B deploy -N - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - 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 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 @@ -55,7 +57,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - travis_retry travis_wait 80 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn 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 @@ -69,18 +71,38 @@ jobs: - echo "Enterprise Integrations Tests on MySQL" - name: "Community Rest API Tests" stage: Tests + before_install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am + install: + - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Community Rest API Tests" - 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: + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise Rest API Tests" - name: "Community UI Tests ..." stage: Tests + before_install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am + install: + - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Community UI Tests ..." - name: "Enterprise UI Tests ..." stage: Tests + before_install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + install: + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise UI Tests ..." diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh new file mode 100644 index 0000000000..b161dbde05 --- /dev/null +++ b/scripts/startAlfresco.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# fail script immediately on any errors in external commands and print the lines +set -ev + +cd $1 +docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} +docker-compose up -d diff --git a/travis-env-vars.yml b/travis-env-vars.yml new file mode 100644 index 0000000000..aa0e1f1190 --- /dev/null +++ b/travis-env-vars.yml @@ -0,0 +1,10 @@ +env: + global: + - 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 + - COMMUNITY_REPO_PATH=rm-community/rm-community-repo + - COMMUNITY_SHARE_PATH=rm-community/rm-community-share + - 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'