From 3ae430ebafdf2fe4d38fd423329d0d643b3ddccb Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 17 Jul 2020 09:01:33 +0300 Subject: [PATCH 01/11] Merge pull request #1173 from Alfresco/feature-2.7/APPS-236_RunCRTests_no Apps 236 run community rest api tests # Conflicts: # rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/SearchRecordsV1CmisTests.java --- .travis.yml | 5 +---- .../rest/rm/community/recordfolders/RecordFolderTests.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 578c3ad808..e0b302e6de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,10 +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: - - 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 + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml - name: "Enterprise Rest API Tests" stage: Tests before_install: diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java index 7ec72a7022..e0266535af 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java @@ -137,8 +137,10 @@ public class RecordFolderTests extends BaseRMRestTest * Then the operation fails * */ + //TODO enable this test when REPO-2454 is fixed @Test ( + enabled = false, description = "Create invalid types as children for a record folder", dataProvider = "childrenNotAllowedForFolder" ) From 03b2bd2aebffa6b0f99fe9345096b0c3035dde2d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 17 Jul 2020 11:32:48 +0300 Subject: [PATCH 02/11] hide mvn downloading parts to reduce the travis job log size --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e0b302e6de..abf50bb710 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: From cf9dc93591d16b86f97fb1ccb068c67aac7afc15 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 20 Jul 2020 07:42:53 +0000 Subject: [PATCH 03/11] redirect logs to file --- .../src/test/resources/log4j.properties | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties 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..33358fb6a9 --- /dev/null +++ b/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties @@ -0,0 +1,9 @@ +# 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 From b39d569885ed03e2374e0409b671c2d70360b596 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 20 Jul 2020 11:21:55 +0000 Subject: [PATCH 04/11] define different value for installer path --- travis-env-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/travis-env-vars.yml b/travis-env-vars.yml index da5c33ff9f..3018a9910a 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/enterprise/5.2/5.2.3/5.2.3.12/alfresco-content-services-installer-5.2.3.12-linux-x64.bin From 70f93980266f739846c30e177b1eabdab840e196 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 20 Jul 2020 11:22:48 +0000 Subject: [PATCH 05/11] define different value for installer path --- 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 3018a9910a..cb6c4b75d6 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -3,4 +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/enterprise/5.2/5.2.3/5.2.3.12/alfresco-content-services-installer-5.2.3.12-linux-x64.bin + - S3_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 26fc0d15cb1bc53693cf6dcf9b6168a076a60893 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 17:09:01 +0300 Subject: [PATCH 06/11] check logs from file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index abf50bb710..c29a6ba24c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,6 +76,7 @@ jobs: 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 + after_failure: tail ./target/reports/rm-automation-community-rest-api.log -5000 - name: "Enterprise Rest API Tests" stage: Tests before_install: From 47194b8e206d38334455220140f3485c362193ba Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 18:18:17 +0300 Subject: [PATCH 07/11] add log4j.appender.stdout.Threshold --- .../src/test/resources/log4j.properties | 6 ++++++ 1 file changed, 6 insertions(+) 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 index 33358fb6a9..cd60f6a5d1 100644 --- 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 @@ -7,3 +7,9 @@ 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 From 51780e59ba00ae6fec92264049494e9276d1aaa8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 09:28:41 +0300 Subject: [PATCH 08/11] remove after_failure --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c29a6ba24c..abf50bb710 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,6 @@ jobs: 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 - after_failure: tail ./target/reports/rm-automation-community-rest-api.log -5000 - name: "Enterprise Rest API Tests" stage: Tests before_install: From 2402bb7c44d386446bc6805d428499b55714f6f6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 10:29:52 +0300 Subject: [PATCH 09/11] Revert "remove after_failure" This reverts commit 51780e59 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index abf50bb710..c29a6ba24c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,6 +76,7 @@ jobs: 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 + after_failure: tail ./target/reports/rm-automation-community-rest-api.log -5000 - name: "Enterprise Rest API Tests" stage: Tests before_install: From f593374679ad9d1a39d3573f82d3c070fa554cc8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 10:30:03 +0300 Subject: [PATCH 10/11] Revert "add log4j.appender.stdout.Threshold" This reverts commit 47194b8e --- .../src/test/resources/log4j.properties | 6 ------ 1 file changed, 6 deletions(-) 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 index cd60f6a5d1..33358fb6a9 100644 --- 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 @@ -7,9 +7,3 @@ 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 From 0ca42acb59207a7ba1694f5d184e4d840dc5820e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 10:30:48 +0300 Subject: [PATCH 11/11] Revert "check logs from file" This reverts commit 26fc0d15 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c29a6ba24c..abf50bb710 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,6 @@ jobs: 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 - after_failure: tail ./target/reports/rm-automation-community-rest-api.log -5000 - name: "Enterprise Rest API Tests" stage: Tests before_install: