From 83d166639307115154e843a5dc19dff95a721354 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 1/9] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac8311739a..59d981a1c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: - 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" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From 1e11443440da255c39457eb81362386c6d0470c6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 2/9] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d49b1f18e2..b964868b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: - 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" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From 46694bd355015c85b88fd74405c8c597162e6c9b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 3/9] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abf50bb710..aed8a6a880 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: - 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" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From 94c3d3c3b74628249e1d5e801d032cbe038f84cf Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 30 Sep 2020 15:15:11 +0300 Subject: [PATCH 4/9] APPS-237 Execute enterprise rest api tests in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abf50bb710..aed8a6a880 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: - 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" + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community UI Tests ..." stage: Tests before_install: From b2a466ecc22d0dd1840c1b607507344270f4d207 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 1 Oct 2020 12:57:00 +0300 Subject: [PATCH 5/9] use enterprise installer 5.2.7.4 for enterprise rest api tests --- .travis.yml | 8 ++++---- scripts/downloadInstaller.sh | 4 ++-- travis-env-vars.yml | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b964868b91..ca7fb54e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ jobs: 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 + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_COMMUNITY_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -81,7 +81,7 @@ jobs: 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 + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -89,7 +89,7 @@ jobs: 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 + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $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 ..." @@ -97,7 +97,7 @@ jobs: 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 + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $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 ..." diff --git a/scripts/downloadInstaller.sh b/scripts/downloadInstaller.sh index 31812860f5..a1a14d237c 100644 --- a/scripts/downloadInstaller.sh +++ b/scripts/downloadInstaller.sh @@ -2,7 +2,7 @@ # fail script immediately on any errors in external commands and print the lines set -ev -outputFile="$TRAVIS_BUILD_DIR/$1/alf-installer.bin" +outputFile="$TRAVIS_BUILD_DIR/$2/alf-installer.bin" host="s3-eu-west-1.amazonaws.com" contentType="binary/octet-stream" dateValue=`TZ=GMT date -R` @@ -12,4 +12,4 @@ 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} + https://${host}$1 -o ${outputFile} diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 497c17faad..5d76d88302 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -3,4 +3,5 @@ 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 - - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin + - S3_COMMUNITY_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin + - S3_ENTERPRISE_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin From 5f66cd900e7c8c97337cb1d611ead3e9095f39ca Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 1 Oct 2020 15:42:07 +0300 Subject: [PATCH 6/9] small fix --- scripts/downloadInstaller.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/downloadInstaller.sh b/scripts/downloadInstaller.sh index a1a14d237c..0616b643cd 100644 --- a/scripts/downloadInstaller.sh +++ b/scripts/downloadInstaller.sh @@ -6,7 +6,7 @@ outputFile="$TRAVIS_BUILD_DIR/$2/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}" +stringToSign="GET\n\n${contentType}\n${dateValue}\n$1" signature=`echo -en ${stringToSign} | openssl sha1 -hmac $RELEASE_AWS_SECRET_KEY -binary | base64` curl -H "Host: ${host}" \ -H "Date: ${dateValue}" \ From 2c4341677657d664d2f1916d8d69f5666db934a7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 2 Oct 2020 07:29:15 +0300 Subject: [PATCH 7/9] use enterprise installer 5.2.3 for enterprise rest api tests --- travis-env-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 5d76d88302..3da82d46bb 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -4,4 +4,4 @@ env: - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - S3_COMMUNITY_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin - - S3_ENTERPRISE_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin + - S3_ENTERPRISE_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.3-build-00012/alfresco-content-services-installer-5.2.3-linux-x64.bin From 3b998744ddb4a770ecefe79d59b24f7dee2bd946 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 2 Oct 2020 12:11:36 +0300 Subject: [PATCH 8/9] Execute enterprise rest api tests --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d30801591..4364639645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,11 +82,12 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am install: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false - name: "Community UI Tests ..." stage: Tests before_install: From 732f747021e8a97d1fa45ffb520a6cf2d34d990d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 2 Oct 2020 15:39:15 +0300 Subject: [PATCH 9/9] corrected stage phases --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4364639645..6b8f43fad1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,17 +46,17 @@ jobs: - name: "Build AGS Enterprise" stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh install: - 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 + before_script: source scripts/setUpMavenPhase.sh 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 $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh 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 @@ -80,14 +80,15 @@ jobs: after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Enterprise Rest API Tests" stage: Tests - before_install: + install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-rm-enterprise-repo -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-rm-automation-enterprise-rest-api -am - install: + before_script: - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - bash scripts/waitForAlfrescoToStart.sh script: - mvn -B test -pl :alfresco-rm-automation-enterprise-rest-api -Dskip.automationtests=false + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - name: "Community UI Tests ..." stage: Tests before_install: