From af5f27f9d40ab7c1011b1eca47e099d91274b463 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 8 Jul 2020 14:10:04 +0300 Subject: [PATCH 01/17] Merge pull request #1167 from Alfresco/feature-2.7/APPS-235_SetupEnv_no Apps 235 Setup environment --- .travis.yml | 25 +++++++++++- rm-automation/pom.xml | 78 ++++++++++++++++++++++++++++++++++++ scripts/downloadInstaller.sh | 15 +++++++ travis-env-vars.yml | 5 +++ 4 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 scripts/downloadInstaller.sh create mode 100644 travis-env-vars.yml diff --git a/.travis.yml b/.travis.yml index b19650f185..77b58bab5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +import: + - source: travis-env-vars.yml os: linux dist: xenial language: java @@ -26,6 +28,9 @@ before_install: - "cp .travis.settings.xml $HOME/.m2/settings.xml" install: skip +services: + - docker + stages: - name: Build AGS - name: Tests @@ -68,21 +73,39 @@ jobs: - echo "Enterprise Integrations Tests on MySQL" - name: "Community Rest API Tests" 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 + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - echo "Community Rest API Tests" +# Uncomment following line to start alfresco env using run-alfresco profile and run the tests. +# Currently commented because running tests is part of APPS-236 task +# travis_wait 90 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml - name: "Enterprise Rest API Tests" 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 + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - echo "Enterprise Rest API Tests" - name: "Community UI Tests ..." 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 + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - echo "Community UI Tests ..." - name: "Enterprise UI Tests ..." 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 + install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - echo "Enterprise UI Tests ..." - - name: "Source Clear Scan (SCA)" stage: Security Scans script: diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 74ec036205..4b8cc1b597 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -90,6 +90,7 @@ + install-alfresco @@ -130,6 +131,83 @@ + + + installAlfresco + + + + io.fabric8 + docker-maven-plugin + 0.31.0 + + + start-postgresql + generate-test-resources + + start + + + + + test-database + postgres:9.1 + + + 5432:5432 + + + alfresco + alfresco + alfresco + + + -c max_connections=300 + + + database system is ready to accept connections + + + + + + + + + + + + maven-antrun-plugin + + + fetch-installer + generate-test-resources + + run + + + + + Installing Alfresco... + + + + + + + + + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + + + + apply-rm-community diff --git a/scripts/downloadInstaller.sh b/scripts/downloadInstaller.sh new file mode 100644 index 0000000000..31812860f5 --- /dev/null +++ b/scripts/downloadInstaller.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# fail script immediately on any errors in external commands and print the lines +set -ev + +outputFile="$TRAVIS_BUILD_DIR/$1/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}" +signature=`echo -en ${stringToSign} | openssl sha1 -hmac $RELEASE_AWS_SECRET_KEY -binary | base64` +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} diff --git a/travis-env-vars.yml b/travis-env-vars.yml new file mode 100644 index 0000000000..da5c33ff9f --- /dev/null +++ b/travis-env-vars.yml @@ -0,0 +1,5 @@ +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 From d244708c30828fe372e02c99357d9b4e5df58ddc Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 9 Jul 2020 14:52:58 +0300 Subject: [PATCH 02/17] start environment with docker --- .travis.yml | 35 +++++++++++++++++------------------ scripts/downloadInstaller.sh | 15 --------------- travis-env-vars.yml | 1 + 3 files changed, 18 insertions(+), 33 deletions(-) delete mode 100644 scripts/downloadInstaller.sh diff --git a/.travis.yml b/.travis.yml index 77b58bab5f..1f677be5cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,6 @@ before_install: - "cp .travis.settings.xml $HOME/.m2/settings.xml" install: skip -services: - - docker - stages: - name: Build AGS - name: Tests @@ -74,36 +71,38 @@ jobs: - name: "Community Rest API Tests" 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 - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml + - travis_retry travis_wait 90 mvn -B install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am + install: + - docker --version + - docker-compose -f rm-community/rm-community-repo/docker-compose.yml up -d + - ./scripts/waitForAlfrescoToStart.sh script: - echo "Community Rest API Tests" -# Uncomment following line to start alfresco env using run-alfresco profile and run the tests. -# Currently commented because running tests is part of APPS-236 task -# travis_wait 90 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml - name: "Enterprise Rest API Tests" 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 - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + install: + - docker-compose -f rm-enterprise/rm-enterprise-repo/docker-compose.yml up -d + - ./scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise Rest API Tests" - name: "Community UI Tests ..." 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 - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am + install: + - docker-compose -f rm-community/rm-community-share/docker-compose.yml up -d + - ./scripts/waitForAlfrescoToStart.sh script: - echo "Community UI Tests ..." - name: "Enterprise UI Tests ..." 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 - install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am + install: + - docker-compose -f rm-enterprise/rm-enterprise-share/docker-compose.yml up -d + - ./scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise UI Tests ..." - name: "Source Clear Scan (SCA)" diff --git a/scripts/downloadInstaller.sh b/scripts/downloadInstaller.sh deleted file mode 100644 index 31812860f5..0000000000 --- a/scripts/downloadInstaller.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -# fail script immediately on any errors in external commands and print the lines -set -ev - -outputFile="$TRAVIS_BUILD_DIR/$1/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}" -signature=`echo -en ${stringToSign} | openssl sha1 -hmac $RELEASE_AWS_SECRET_KEY -binary | base64` -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} diff --git a/travis-env-vars.yml b/travis-env-vars.yml index da5c33ff9f..b8e33bb34f 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -3,3 +3,4 @@ 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 + - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' From be57cc9196006da6d2c20fae5d7ff7d6cda5ddd3 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 9 Jul 2020 17:00:31 +0300 Subject: [PATCH 03/17] skip build AGS to be able to test start env without waiting --- .travis.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f677be5cc..c4b08857a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,24 +41,24 @@ jobs: - name: "Build AGS Community" stage: Build AGS before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - - name: "Build AGS Enterprise" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - 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 - 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 -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 + script: skip +# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn +# +# - name: "Build AGS Enterprise" +# stage: Build AGS +# before_script: source scripts/setUpMavenPhase.sh +# install: +# - 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 +# 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 -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 - name: "Community Integrations Tests on MySQL" stage: Tests From 593ddf05cfd556f5eed40780d1940e11bbdd815f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 9 Jul 2020 17:32:19 +0300 Subject: [PATCH 04/17] call docker-compose from the directory where the .env file is defined, otherwise it isn't recognised --- .travis.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4b08857a0..1a0dec0bf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,8 +73,9 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am install: - - docker --version - - docker-compose -f rm-community/rm-community-repo/docker-compose.yml up -d + - cd rm-community/rm-community-repo + - docker-compose up -d + before_script: - ./scripts/waitForAlfrescoToStart.sh script: - echo "Community Rest API Tests" @@ -83,7 +84,9 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am install: - - docker-compose -f rm-enterprise/rm-enterprise-repo/docker-compose.yml up -d + - cd rm-enterprise/rm-enterprise-repo + - docker-compose up -d + before_script: - ./scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise Rest API Tests" @@ -92,7 +95,9 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am install: - - docker-compose -f rm-community/rm-community-share/docker-compose.yml up -d + - cd rm-community/rm-community-share + - docker-compose up -d + before_script: - ./scripts/waitForAlfrescoToStart.sh script: - echo "Community UI Tests ..." @@ -101,7 +106,9 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am install: - - docker-compose -f rm-enterprise/rm-enterprise-share/docker-compose.yml up -d + - cd rm-enterprise/rm-enterprise-share + - docker-compose up -d + before_script: - ./scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise UI Tests ..." From 04017077ac923f8442707caa76003cbf85beec53 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 9 Jul 2020 18:01:37 +0300 Subject: [PATCH 05/17] start alfresco and change directory back to root --- .travis.yml | 18 +++++------------- scripts/startAlfresco.sh | 5 +++++ 2 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 scripts/startAlfresco.sh diff --git a/.travis.yml b/.travis.yml index 1a0dec0bf6..1eaae62e7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,11 +71,9 @@ jobs: - name: "Community Rest API Tests" stage: Tests before_install: - - travis_retry travis_wait 90 mvn -B 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 install: - - cd rm-community/rm-community-repo - - docker-compose up -d - before_script: + - ./scripts/startAlfresco.sh rm-community/rm-community-repo - ./scripts/waitForAlfrescoToStart.sh script: - echo "Community Rest API Tests" @@ -84,9 +82,7 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am install: - - cd rm-enterprise/rm-enterprise-repo - - docker-compose up -d - before_script: + - ./scripts/startAlfresco.sh rm-enterprise/rm-enterprise-repo - ./scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise Rest API Tests" @@ -95,9 +91,7 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am install: - - cd rm-community/rm-community-share - - docker-compose up -d - before_script: + - ./scripts/startAlfresco.sh rm-community/rm-community-share - ./scripts/waitForAlfrescoToStart.sh script: - echo "Community UI Tests ..." @@ -106,9 +100,7 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am install: - - cd rm-enterprise/rm-enterprise-share - - docker-compose up -d - before_script: + - ./scripts/startAlfresco.sh rm-enterprise/rm-enterprise-share - ./scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise UI Tests ..." diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh new file mode 100644 index 0000000000..238ad32f87 --- /dev/null +++ b/scripts/startAlfresco.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +cd $1 +docker-compose up -d +cd ../.. From 05ebdb3c85729cc1560eea2d009cb45966749370 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 9 Jul 2020 18:22:53 +0300 Subject: [PATCH 06/17] start alfresco and change directory back to root --- scripts/startAlfresco.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh index 238ad32f87..6c93fb3112 100644 --- a/scripts/startAlfresco.sh +++ b/scripts/startAlfresco.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# fail script immediately on any errors in external commands and print the lines +set -ev cd $1 docker-compose up -d -cd ../.. +cd $TRAVIS_BUILD_DIR +ls From 801b58591faa04476415ed2d585f437d8c743d71 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 9 Jul 2020 18:38:24 +0300 Subject: [PATCH 07/17] try to get rid of Permission denied --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1eaae62e7b..ef70133bea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,8 +73,8 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am install: - - ./scripts/startAlfresco.sh rm-community/rm-community-repo - - ./scripts/waitForAlfrescoToStart.sh + - bash scripts/startAlfresco.sh rm-community/rm-community-repo + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Community Rest API Tests" - name: "Enterprise Rest API Tests" @@ -82,8 +82,8 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am install: - - ./scripts/startAlfresco.sh rm-enterprise/rm-enterprise-repo - - ./scripts/waitForAlfrescoToStart.sh + - bash scripts/startAlfresco.sh rm-enterprise/rm-enterprise-repo + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise Rest API Tests" - name: "Community UI Tests ..." @@ -91,8 +91,8 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am install: - - ./scripts/startAlfresco.sh rm-community/rm-community-share - - ./scripts/waitForAlfrescoToStart.sh + - bash scripts/startAlfresco.sh rm-community/rm-community-share + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Community UI Tests ..." - name: "Enterprise UI Tests ..." @@ -100,8 +100,8 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am install: - - ./scripts/startAlfresco.sh rm-enterprise/rm-enterprise-share - - ./scripts/waitForAlfrescoToStart.sh + - bash scripts/startAlfresco.sh rm-enterprise/rm-enterprise-share + - bash scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise UI Tests ..." - name: "Source Clear Scan (SCA)" From 65a4fc71b04efa9be166c963dea72249063e556f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 13 Jul 2020 10:50:04 +0300 Subject: [PATCH 08/17] login to quay --- scripts/startAlfresco.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh index 6c93fb3112..815f38548c 100644 --- a/scripts/startAlfresco.sh +++ b/scripts/startAlfresco.sh @@ -3,6 +3,7 @@ set -ev cd $1 +docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} docker-compose up -d cd $TRAVIS_BUILD_DIR ls From cc02e46bca09f3feeac5e75462a4d0cf67bfc7fe Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 13 Jul 2020 11:18:20 +0300 Subject: [PATCH 09/17] remove ls --- scripts/startAlfresco.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh index 815f38548c..92020d8c73 100644 --- a/scripts/startAlfresco.sh +++ b/scripts/startAlfresco.sh @@ -6,4 +6,3 @@ cd $1 docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} docker-compose up -d cd $TRAVIS_BUILD_DIR -ls From 15668b9334e67e50372d4cbb379b15ab10f36661 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 13 Jul 2020 12:33:39 +0300 Subject: [PATCH 10/17] Revert "skip build AGS to be able to test start env without waiting" This reverts commit be57cc91 --- .travis.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3149ad1c6..6394db7580 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,24 +41,24 @@ jobs: - name: "Build AGS Community" stage: Build AGS before_script: source scripts/setUpMavenPhase.sh - script: skip -# - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -# -# - name: "Build AGS Enterprise" -# stage: Build AGS -# before_script: source scripts/setUpMavenPhase.sh -# install: -# - 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 -# 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 -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 + script: + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: "Build AGS Enterprise" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - 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 + 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 -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 - name: "Community Integrations Tests on MySQL" stage: Tests From 240a18fea170266b43da4d85fef7607874174428 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 13 Jul 2020 12:41:53 +0300 Subject: [PATCH 11/17] removed profile because it isn't needed for AGS versions >= 3.0 --- rm-automation/pom.xml | 77 ------------------------------------------- 1 file changed, 77 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 4b8cc1b597..55684ec3f3 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -131,83 +131,6 @@ - - - installAlfresco - - - - io.fabric8 - docker-maven-plugin - 0.31.0 - - - start-postgresql - generate-test-resources - - start - - - - - test-database - postgres:9.1 - - - 5432:5432 - - - alfresco - alfresco - alfresco - - - -c max_connections=300 - - - database system is ready to accept connections - - - - - - - - - - - - maven-antrun-plugin - - - fetch-installer - generate-test-resources - - run - - - - - Installing Alfresco... - - - - - - - - - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - - - apply-rm-community From 11542ce878f5c3742ccba4a330b621b10bc64041 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 13 Jul 2020 13:03:42 +0300 Subject: [PATCH 12/17] use MVN_SKIP variable --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6394db7580..1584ef81b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - 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 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 @@ -56,7 +56,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - travis_retry travis_wait 60 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 60 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 From 3b889e89d2de88f30d3e36f345799f8adf10507c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 13 Jul 2020 17:14:07 +0300 Subject: [PATCH 13/17] don't change directory back to root --- scripts/startAlfresco.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh index 92020d8c73..b161dbde05 100644 --- a/scripts/startAlfresco.sh +++ b/scripts/startAlfresco.sh @@ -5,4 +5,3 @@ set -ev cd $1 docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} docker-compose up -d -cd $TRAVIS_BUILD_DIR From 6d74e387f58be9486f8e3d549556239777f248ee Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Jul 2020 13:43:06 +0300 Subject: [PATCH 14/17] code review comments --- .travis.yml | 9 +++++---- rm-automation/pom.xml | 1 - travis-env-vars.yml | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1584ef81b4..e2d6727113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo -am install: - - bash scripts/startAlfresco.sh rm-community/rm-community-repo + - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - echo "Community Rest API Tests" @@ -82,7 +82,7 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am install: - - bash scripts/startAlfresco.sh rm-enterprise/rm-enterprise-repo + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise Rest API Tests" @@ -91,7 +91,7 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-community-repo,:alfresco-rm-community-share -am install: - - bash scripts/startAlfresco.sh rm-community/rm-community-share + - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - bash scripts/waitForAlfrescoToStart.sh script: - echo "Community UI Tests ..." @@ -100,10 +100,11 @@ jobs: before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo,:alfresco-rm-enterprise-share -am install: - - bash scripts/startAlfresco.sh rm-enterprise/rm-enterprise-share + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - bash scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise UI Tests ..." + - name: "Source Clear Scan (SCA)" stage: Security Scans script: diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 55684ec3f3..74ec036205 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -90,7 +90,6 @@ - install-alfresco diff --git a/travis-env-vars.yml b/travis-env-vars.yml index b8e33bb34f..aa0e1f1190 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -3,4 +3,8 @@ 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 + - 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' From db2872c6337970d9449161d98a37f479c284d22b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Jul 2020 17:42:30 +0300 Subject: [PATCH 15/17] Merge pull request #1170 from Alfresco/merge-3.0/APPS-235_SetupEnv_no Merge 3.0/apps 235 setup env no --- .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 edce7a01f3..e92d6169d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +import: + - source: travis-env-vars.yml os: linux dist: xenial language: java @@ -46,7 +48,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - 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 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 @@ -54,7 +56,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - travis_retry travis_wait 60 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 60 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 @@ -68,18 +70,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-rm-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-rm-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-rm-community-repo,:alfresco-rm-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-rm-enterprise-repo,:alfresco-rm-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' From f53834190c3c4daba4351c0e9e851bfa77946df0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Jul 2020 17:42:30 +0300 Subject: [PATCH 16/17] Merge pull request #1170 from Alfresco/merge-3.0/APPS-235_SetupEnv_no Merge 3.0/apps 235 setup env no --- .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 5ca06b560a..81639d159f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +import: + - source: travis-env-vars.yml os: linux dist: xenial language: java @@ -46,7 +48,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - 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 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 @@ -54,7 +56,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - travis_retry travis_wait 60 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 60 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 @@ -68,18 +70,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-rm-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-rm-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-rm-community-repo,:alfresco-rm-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-rm-enterprise-repo,:alfresco-rm-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' From 28960dcff6eb7b36f23e806d3a1a16ee3d4f57dc Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Jul 2020 17:42:30 +0300 Subject: [PATCH 17/17] Merge pull request #1170 from Alfresco/merge-3.0/APPS-235_SetupEnv_no Merge 3.0/apps 235 setup env no --- .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 edce7a01f3..e92d6169d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +import: + - source: travis-env-vars.yml os: linux dist: xenial language: java @@ -46,7 +48,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - 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 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 @@ -54,7 +56,7 @@ jobs: stage: Build AGS before_script: source scripts/setUpMavenPhase.sh install: - - travis_retry travis_wait 60 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 60 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 @@ -68,18 +70,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-rm-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-rm-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-rm-community-repo,:alfresco-rm-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-rm-enterprise-repo,:alfresco-rm-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'