Merge branch 'master' of github.com:Alfresco/governance-services into feature/REPO-5439v2

Conflicts: rm-enterprise/pom.xml rm-enterprise/rm-enterprise-repo/pom.xml travis/.travis.tests-stage.yml
2025-07-31 17:39:05 +00:00 · 2021-02-23 10:51:24 +02:00
parent 476e9c55a0 44c8a6caf2
commit 80b319c031
5 changed files with 43 additions and 14 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -533,7 +533,7 @@
      <alfresco.groupId>org.alfresco</alfresco.groupId>
      <alfresco.share.artifactId>share</alfresco.share.artifactId>
      <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
-      <api.explorer.version>7.0.0-A3</api.explorer.version>
+      <api.explorer.version>7.0.0-A4</api.explorer.version>
      <!-- Set this here and override it in the community and enterprise modules. -->
      <alfresco.min.version>0.0</alfresco.min.version>

--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -75,7 +75,7 @@
   <properties>
      <spring.version>5.3.3</spring.version>
      <alfresco.min.version>7.0.0</alfresco.min.version>
-      <share.version>7.0.0-A15</share.version>
+      <share.version>7.0.0-A17</share.version>
      <!-- The properties app.amp.* need to be set for share to work. -->
      <app.filtering.enabled>true</app.filtering.enabled>
   </properties>
--- 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 @@
        </property>
    </bean>

-   <!-- RM Container Cache Manager -->
-   <bean id="rmContainerCache" class="org.alfresco.repo.cache.DefaultSimpleCache" />
+    <bean name="rmContainerCache" factory-bean="cacheFactory" factory-method="createCache">
+        <constructor-arg value="cache.rmContainerCache" />
+    </bean>

+    <!-- RM Container Cache Manager -->
   <bean id="rmContainerCacheManager" class="org.alfresco.module.org_alfresco_module_rm.util.RMContainerCacheManager">
     <property name="nodeService" ref="nodeService" />
     <property name="cache" ref="rmContainerCache" />
--- 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
--- 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,13 +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
-
+            - alfresco.log
+            - solr.log
+          target_paths: $TRAVIS_BUILD_NUMBER/$TRAVIS_JOB_NUMBER
    - name: "Enterprise Rest API Cluster Tests"
      stage: Tests
      install:
@@ -68,8 +86,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"
@@ -101,7 +121,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"
@@ -142,7 +162,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"
@@ -185,4 +205,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