From 6d2c4ff499b18d99ef55a05f7904d1c473ddc9e1 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 c4bf886b4e..ccd0eac978 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,10 +76,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 d955510c278e1754f7ba1ee573df38208046dff8 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 ccd0eac978..d49b1f18e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,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 32a5c811526c7334ace52df1143a1376c9eead31 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 f2d00fa2cb0c93be2f26acf78ba99b0f284a7d15 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 d89b991ec1e4612f875ff9c2094024c2b1b7f248 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 13:26:38 +0300 Subject: [PATCH 05/11] add console appender definition --- .../src/test/resources/log4j.properties | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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..159cd65345 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 @@ -1,5 +1,12 @@ # Root logger option -log4j.rootLogger=INFO, file, stdout +log4j.rootLogger=INFO, Console, file + +###### Console appender definition ####### + +# All outputs currently set to be a ConsoleAppender. +log4j.appender.Console=org.apache.log4j.ConsoleAppender +log4j.appender.Console.layout=org.apache.log4j.PatternLayout +log4j.appender.Console.layout.ConversionPattern=%d{HH:mm:ss.SSS} %-5p [%c{1}] %m%n # Direct log messages to a log file log4j.appender.file=org.apache.log4j.RollingFileAppender From 5fbf9e24cec75cad7c8f5a272d05052dae76158f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 16:50:19 +0300 Subject: [PATCH 06/11] direct log messages to stdout --- .../src/test/resources/log4j.properties | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 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 159cd65345..afc2035c2a 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 @@ -1,12 +1,5 @@ # Root logger option -log4j.rootLogger=INFO, Console, file - -###### Console appender definition ####### - -# All outputs currently set to be a ConsoleAppender. -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout -log4j.appender.Console.layout.ConversionPattern=%d{HH:mm:ss.SSS} %-5p [%c{1}] %m%n +log4j.rootLogger=INFO, file, stdout # Direct log messages to a log file log4j.appender.file=org.apache.log4j.RollingFileAppender @@ -14,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.Target=System.out +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 1501d580070c03e041eb4416a82dcc67a9d93be4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 17:09:01 +0300 Subject: [PATCH 07/11] check logs from file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d49b1f18e2..c99c7f1e77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,6 +77,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 8d5f7ab722a39b5c7b4bc4823368b9ed204edcd1 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 18:18:17 +0300 Subject: [PATCH 08/11] add log4j.appender.stdout.Threshold --- .../src/test/resources/log4j.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 afc2035c2a..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 @@ -10,6 +10,6 @@ log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - % # Direct log messages to stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out +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 3dbca08e799d686f74ed9108fe953a0f52cd20b4 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 07:36:48 +0300 Subject: [PATCH 09/11] check logs from file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c99c7f1e77..2046fd7022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,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 + after_failure: tail -n 5000 ./target/reports/rm-automation-community-rest-api.log - name: "Enterprise Rest API Tests" stage: Tests before_install: From 02fd7a1c1c02bf61da7eb67442a202c76601e7c9 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 09:28:41 +0300 Subject: [PATCH 10/11] remove after_failure --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2046fd7022..d49b1f18e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,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 -n 5000 ./target/reports/rm-automation-community-rest-api.log - name: "Enterprise Rest API Tests" stage: Tests before_install: From cb89727f4f5ed19099e11a907c29160927b4fe71 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 27 Aug 2020 10:18:40 +0300 Subject: [PATCH 11/11] fix the community installer --- 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..497c17faad 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/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin