Merge release/v2.7.0.x into release/v2.7

This commit is contained in:
Claudia Agache
2020-08-27 14:08:13 +03:00
parent 134d899d58
commit 3c1eda7601
3 changed files with 18 additions and 2 deletions

View File

@@ -50,7 +50,7 @@ jobs:
install: 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 -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: 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" - name: "Build AGS Benchmark"
stage: Build AGS stage: Build AGS
@@ -75,7 +75,7 @@ jobs:
- travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target - 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 install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml
script: 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" - name: "Enterprise Rest API Tests"
stage: Tests stage: Tests
before_install: before_install:

View File

@@ -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

View File

@@ -3,3 +3,4 @@ env:
- AUTOMATION_COMMUNITY_PATH=rm-automation/rm-automation-community-rest-api - AUTOMATION_COMMUNITY_PATH=rm-automation/rm-automation-community-rest-api
- AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api
- AUTOMATION_UI_PATH=rm-automation/rm-automation-ui - 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