review changes

.travis.settings.xml

@@ -38,7 +38,6 @@
       </profile>
    </profiles>
 
-
    <servers>
       <server>
          <id>docker.io</id>

.travis.yml

@@ -9,10 +9,10 @@ services:
 
 branches:
   only:
-    - /release\/V3.0.*/
+    - /release\/V3.\d.*/
-    - /feature-3.0\/.*/
+    - /feature-3.\d\/.*/
-    - /merge-3.0\/.*/
+    - /merge-3.\d\/.*/
-    - /hotfix-3.0\/.*/
+    - /hotfix-3.\d\/.*/
 
 cache:
   directories:
@@ -20,7 +20,7 @@ cache:
 
 # the cache can grow constantly
 before_cache:
-  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-governace*
+  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-rm*
 
 before_install:
   - "cp .travis.settings.xml $HOME/.m2/settings.xml"

scripts/setUpMavenPhase.sh

@@ -1,10 +1,14 @@
 #!/usr/bin/env bash
 echo "Branch name: ${TRAVIS_BRANCH}"
 echo "Pull request: ${TRAVIS_PULL_REQUEST}"
+echo "Travis job name: ${TRAVIS_JOB_NAME}"
+echo "Travis job id: ${TRAVIS_JOB_ID}"
 branchName=${TRAVIS_BRANCH}
 imageTag=${branchName:8}
 echo "Image tag: ${imageTag}"
 
+case ${TRAVIS_JOB_NAME} in
+"Build AGS Community"|"Build AGS Benchmark" )
     if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]];
     then
         export MAVEN_PHASE="deploy"
@@ -20,4 +24,22 @@ else
         export BUILD_PROFILE="buildDockerImage"
         export IMAGE_TAG="latest"
     fi
-
+    ;;
+"Build AGS Enterprise" )
+   if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]];
+    then
+        export MAVEN_PHASE="deploy"
+        export BUILD_PROFILE="internal"
+        export IMAGE_TAG="latest"
+    elif [[ ${TRAVIS_BRANCH} = release*  && "${TRAVIS_PULL_REQUEST}" == "false" ]];
+    then
+        export MAVEN_PHASE="deploy"
+        export BUILD_PROFILE="internal"
+        export IMAGE_TAG="${imageTag}-latest"
+    else
+        export MAVEN_PHASE="verify"
+        export BUILD_PROFILE="buildDockerImage"
+        export IMAGE_TAG="latest"
+    fi
+    ;;
+esac