From 3d3c72a4d230ad05ec9fe2124d4415e8710ffee4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 14:08:13 +0300 Subject: [PATCH] Merge release/v2.7.0.x into release/v2.7 --- .travis.yml | 4 ++-- .../src/test/resources/log4j.properties | 15 +++++++++++++++ travis-env-vars.yml | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties diff --git a/.travis.yml b/.travis.yml index e0b302e6de..ac8311739a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ jobs: 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 clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -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 @@ -75,7 +75,7 @@ jobs: - 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: - - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml + - 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 - name: "Enterprise Rest API Tests" stage: Tests before_install: diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties b/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties new file mode 100644 index 0000000000..cd60f6a5d1 --- /dev/null +++ b/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties @@ -0,0 +1,15 @@ +# Root logger option +log4j.rootLogger=INFO, file, stdout + +# Direct log messages to a log file +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.File=./target/reports/rm-automation-community-rest-api.log +log4j.appender.file.MaxBackupIndex=10 +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n + +# Direct log messages to stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Threshold=INFO +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n diff --git a/travis-env-vars.yml b/travis-env-vars.yml index da5c33ff9f..497c17faad 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 + - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin