From f67d43b40ba332aa28fbe060c5b8d2df520f4647 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Tue, 16 Feb 2021 10:23:56 +0200 Subject: [PATCH 1/8] APPS-753: change the cache.type to invalidating. --- .../module/org_alfresco_module_rm/rm-service-context.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index e3c6db1578..29b5a0e785 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -391,9 +391,11 @@ - - + + + + From 6a7b25293afbd21e926442d54845b24ecea474c5 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 16 Feb 2021 13:27:32 +0000 Subject: [PATCH 2/8] [maven-release-plugin][skip ci] prepare release V3.5.0-A3 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 2503f84b4d..6244dd098b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.5.0-SNAPSHOT + 3.5.0-A3 Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - HEAD + V3.5.0-A3 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 5eee570158..753d907d84 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-SNAPSHOT + 3.5.0-A3 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index b559c7682d..2a7919abd7 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.5.0-SNAPSHOT + 3.5.0-A3 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 588a153f3f..75c020c648 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-SNAPSHOT + 3.5.0-A3 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 48b100bb2b..924abec50c 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-SNAPSHOT + 3.5.0-A3 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 7c19b1535b..8e56f97ae5 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-SNAPSHOT + 3.5.0-A3 From f1b6c1f4054f98c24569834571e6fab9c8948fac Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 16 Feb 2021 13:27:39 +0000 Subject: [PATCH 3/8] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6244dd098b..2503f84b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.5.0-A3 + 3.5.0-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V3.5.0-A3 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 753d907d84..5eee570158 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-A3 + 3.5.0-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 2a7919abd7..b559c7682d 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.5.0-A3 + 3.5.0-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 75c020c648..588a153f3f 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-A3 + 3.5.0-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 924abec50c..48b100bb2b 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-A3 + 3.5.0-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 8e56f97ae5..7c19b1535b 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-A3 + 3.5.0-SNAPSHOT From 0fc231fca29400bd0eca5336917bf21478ed92a8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 18 Feb 2021 10:46:55 +0200 Subject: [PATCH 4/8] [enterprise release 3.5.0-A4 3.5.0-SNAPSHOT] [skip tests] From 09adbd7fec5f30af4604d99a759df901f9bd11ac Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Thu, 18 Feb 2021 10:35:12 +0000 Subject: [PATCH 5/8] [maven-release-plugin][skip ci] prepare release V3.5.0-A4 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 2503f84b4d..e9bdbde933 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.5.0-SNAPSHOT + 3.5.0-A4 Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - HEAD + V3.5.0-A4 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 5eee570158..dd8b6c4c94 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-SNAPSHOT + 3.5.0-A4 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index b559c7682d..07883b78c6 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.5.0-SNAPSHOT + 3.5.0-A4 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 588a153f3f..55a94c6ba3 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-SNAPSHOT + 3.5.0-A4 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 48b100bb2b..d7ac3b9595 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-SNAPSHOT + 3.5.0-A4 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 7c19b1535b..7ceb06e7d0 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-SNAPSHOT + 3.5.0-A4 From 557b984d47240ef254d5f2e3ba0ff970f0fadd3c Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Thu, 18 Feb 2021 10:35:18 +0000 Subject: [PATCH 6/8] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e9bdbde933..2503f84b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.5.0-A4 + 3.5.0-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V3.5.0-A4 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index dd8b6c4c94..5eee570158 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-A4 + 3.5.0-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 07883b78c6..b559c7682d 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.5.0-A4 + 3.5.0-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 55a94c6ba3..588a153f3f 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-A4 + 3.5.0-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index d7ac3b9595..48b100bb2b 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-A4 + 3.5.0-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 7ceb06e7d0..7c19b1535b 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-A4 + 3.5.0-SNAPSHOT From 2f715a1c51fa4efbd14ed8132898aeefe23cd8bd Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 22 Feb 2021 20:31:01 +0200 Subject: [PATCH 7/8] update ACS to 7.0.0-A27 --- pom.xml | 4 ++-- rm-community/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2503f84b4d..8028720281 100644 --- a/pom.xml +++ b/pom.xml @@ -533,7 +533,7 @@ org.alfresco share 8.15 - 7.0.0-A3 + 7.0.0-A4 0.0 @@ -597,7 +597,7 @@ 4.0.1 1.19 - 8.382 + 8.400 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 588a153f3f..a0ddfa4928 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -75,7 +75,7 @@ 5.3.3 7.0.0 - 7.0.0-A15 + 7.0.0-A17 true From 696bc7c52a71e6294eb560908fc0b1915c5cf97f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 22 Feb 2021 20:43:44 +0200 Subject: [PATCH 8/8] get logs for each job. increase memory for docker containers --- scripts/getLogs.sh | 7 +++++- travis/.travis.tests-stage.yml | 42 +++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/scripts/getLogs.sh b/scripts/getLogs.sh index 930440b4cb..b84c408689 100644 --- a/scripts/getLogs.sh +++ b/scripts/getLogs.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash set -x +# Display running containers +docker ps + alfrescoContainerId=$(docker ps -a | grep '_alfresco_' | awk '{print $1}') shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}') solrContainerId=$(docker ps -a | grep '_search_' | awk '{print $1}') @@ -9,4 +12,6 @@ docker logs $alfrescoContainerId > alfresco.log if [ -n "$shareContainerId" ]; then docker logs $shareContainerId > share.log fi -docker logs $solrContainerId > solr.log +if [ -n "$solrContainerId" ]; then + docker logs $solrContainerId > solr.log +fi diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index af9ff3931f..2ec17a9ae0 100644 --- a/travis/.travis.tests-stage.yml +++ b/travis/.travis.tests-stage.yml @@ -2,6 +2,13 @@ jobs: include: - name: "Community Rest API Tests" stage: Tests + addons: + artifacts: + paths: + - ./rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log + - alfresco.log + - solr.log + target_paths: $TRAVIS_BUILD_NUMBER/$TRAVIS_JOB_NUMBER install: - | if [[ ${TRAVIS_BRANCH} == *community* ]]; then @@ -19,10 +26,17 @@ jobs: fi - bash scripts/waitForAlfrescoToStart.sh script: travis_wait 40 mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + after_script: bash scripts/getLogs.sh - name: "Enterprise Rest API Tests" stage: Tests + addons: + artifacts: + paths: + - ./rm-automation/rm-automation-enterprise-rest-api/target/reports/rm-automation-enterprise-rest-api.log + - alfresco.log + - solr.log + target_paths: $TRAVIS_BUILD_NUMBER/$TRAVIS_JOB_NUMBER install: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am @@ -33,15 +47,17 @@ jobs: - sudo free -m -t script: - travis_wait 90 mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + after_script: bash scripts/getLogs.sh + + - name: "Enterprise Rest API WORM Tests" + stage: Tests addons: artifacts: paths: - ./rm-automation/rm-automation-enterprise-rest-api/target/reports/rm-automation-enterprise-rest-api.log - - ./rm-automation/rm-automation-enterprise-rest-api/target/surefire-reports - - - name: "Enterprise Rest API WORM Tests" - stage: Tests + - alfresco.log + - solr.log + target_paths: $TRAVIS_BUILD_NUMBER/$TRAVIS_JOB_NUMBER install: - travis_retry travis_wait 90 mvn -B -U -q clean install ${MVN_SKIP} -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am @@ -50,8 +66,10 @@ jobs: - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/docker-compose-worm-support-rest.yml" - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false - after_script: bash scripts/cleanup.sh - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + after_script: + - bash scripts/getLogs.sh + - bash scripts/cleanup.sh + - &community_shared_UI_configuration name: "Community Smoke UI Tests for Records" @@ -83,7 +101,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-ui -am script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-governance-services-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - after_failure: bash scripts/getLogs.sh + after_script: bash scripts/getLogs.sh - <<: *community_shared_UI_configuration name: "Community Smoke UI Tests for actions in RM site" @@ -124,7 +142,7 @@ jobs: - sudo free -m -t script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-governance-services-automation-ui -Dskip.automationtests=false -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - after_failure: bash scripts/getLogs.sh + after_script: bash scripts/getLogs.sh - <<: *enterprise_shared_UI_configuration name: "Enterprise Classification Level 2 UI Tests" @@ -167,4 +185,6 @@ jobs: - bash scripts/waitForAlfrescoToStart.sh script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} - after_script: bash scripts/cleanup.sh + after_script: + - bash scripts/getLogs.sh + - bash scripts/cleanup.sh