Merge branch 'release/V3.1' of https://github.com/Alfresco/governance-services into release/V3.1

.travis.settings.xml

@@ -44,6 +44,11 @@
          <username>${env.DOCKERHUB_USERNAME}</username>
          <password>${env.DOCKERHUB_PASSWORD}</password>
       </server>
+      <server>
+         <id>quay.io</id>
+         <username>${env.QUAY_USERNAME}</username>
+         <password>${env.QUAY_PASSWORD}</password>
+      </server>
       <server>
          <id>alfresco-internal</id>
          <username>${env.MAVEN_USERNAME}</username>
@@ -54,5 +59,10 @@
          <username>${env.MAVEN_USERNAME}</username>
          <password>${env.MAVEN_PASSWORD}</password>
       </server>
+      <server>
+         <id>alfresco-internal-snapshots</id>
+         <username>${env.MAVEN_USERNAME}</username>
+         <password>${env.MAVEN_PASSWORD}</password>
+      </server>
    </servers>
 </settings>

.travis.yml

@@ -4,19 +4,23 @@ language: java
 jdk:
   - openjdk11
 
+services:
+  - docker
+
 branches:
   only:
-    - /release\/V2.7.*/
-    - /feature-2.7\/.*/
-    - /merge-2.7\/.*/
-    - /hotfix-2.7\/.*/
+    - /release\/V3.\d+.*/
+    - /feature-3.\d+\/.*/
+    - /merge-3.\d+\/.*/
+    - /hotfix-3.\d+\/.*/
 
 cache:
   directories:
     - $HOME/.m2
+
 # the cache can grow constantly
 before_cache:
-  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-rm*
+  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-governance-services*
 
 before_install:
   - "cp .travis.settings.xml $HOME/.m2/settings.xml"
@@ -32,18 +36,27 @@ stages:
 
 jobs:
   include:
-    - name: "Build Community"
+    - name: "Build AGS Community"
       stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
       script:
-        - echo "Build Community"
-    - name: "Build Enterprise"
+        - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Build AGS Enterprise"
       stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
+      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
       script:
-        - echo "Build Enterprise"
-    - name: "Benchmark"
+        - travis_retry travis_wait 60 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Build AGS Benchmark"
       stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
+      install:
+        - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
       script:
-        - echo "Benchmark"
+        - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
     - name: "Community Integrations Tests on MySQL"
       stage: Tests

pom.xml

@@ -1163,6 +1163,7 @@
                      <id>start</id>
                      <phase>pre-integration-test</phase>
                      <goals>
+                        <goal>stop</goal>
                         <goal>start</goal>
                      </goals>
                   </execution>

scripts/setUpMavenPhase.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+echo "Branch name: ${TRAVIS_BRANCH}"
+echo "Pull request: ${TRAVIS_PULL_REQUEST}"
+echo "Travis job name: ${TRAVIS_JOB_NAME}"
+branchName=${TRAVIS_BRANCH}
+imageTag=${branchName:8}
+echo "Image tag: ${imageTag}"
+
+  if [[ ${TRAVIS_JOB_NAME} == "Build AGS Enterprise" ]];
+  then
+     export BUILD_PROFILE="internal"
+  else
+     export BUILD_PROFILE="master"
+  fi
+
+  if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]];
+  then
+      export MAVEN_PHASE="deploy"
+      export IMAGE_TAG="latest"
+  elif [[ ${TRAVIS_BRANCH} = release*  && "${TRAVIS_PULL_REQUEST}" == "false" ]];
+  then
+      export MAVEN_PHASE="deploy"
+      export IMAGE_TAG="${imageTag}-latest"
+  else
+      export MAVEN_PHASE="verify"
+      export BUILD_PROFILE="buildDockerImage"
+      export IMAGE_TAG="latest"
+  fi