diff --git a/.travis.settings.xml b/.travis.settings.xml
index 6c37b1a409..b08ca45199 100644
--- a/.travis.settings.xml
+++ b/.travis.settings.xml
@@ -45,6 +45,11 @@
${env.DOCKERHUB_USERNAME}
${env.DOCKERHUB_PASSWORD}
+
+ quay.io
+ ${env.QUAY_USERNAME}
+ ${env.QUAY_PASSWORD}
+
alfresco-internal
${env.MAVEN_USERNAME}
diff --git a/.travis.yml b/.travis.yml
index 428efbc07c..693ffe541d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,15 @@ language: java
jdk:
- openjdk11
+services:
+ - docker
+
branches:
only:
- - /release\/V2.7.*/
- - /feature-2.7\/.*/
- - /merge-2.7\/.*/
- - /hotfix-2.7\/.*/
+ - /release\/V3.0.*/
+ - /feature-3.0\/.*/
+ - /merge-3.0\/.*/
+ - /hotfix-3.0\/.*/
cache:
directories:
@@ -37,7 +40,7 @@ jobs:
stage: Build AGS
before_script: source scripts/setUpMavenPhase.sh
script:
- - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ - travis_retry travis_wait 80 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
@@ -45,7 +48,7 @@ jobs:
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:
- - travis_retry travis_wait 60 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ - travis_retry travis_wait 60 mvn -B -q clean ${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
diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh
index 60be3bb87e..d20fe92de9 100644
--- a/scripts/setUpMavenPhase.sh
+++ b/scripts/setUpMavenPhase.sh
@@ -1,11 +1,23 @@
#!/usr/bin/env bash
echo "Branch name: ${TRAVIS_BRANCH}"
echo "Pull request: ${TRAVIS_PULL_REQUEST}"
+branchName=${TRAVIS_BRANCH}
+imageTag=${branchName:8}
+echo "Image tag: ${imageTag}"
-if [[ "${TRAVIS_BRANCH}" == "master" || "${TRAVIS_BRANCH}" = release* ]] && [ "${TRAVIS_PULL_REQUEST}" == "false" ];
+if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]];
then
export MAVEN_PHASE="deploy"
+ export BUILD_PROFILE="master"
+ export IMAGE_TAG="latest"
+elif [[ ${TRAVIS_BRANCH} = release* && "${TRAVIS_PULL_REQUEST}" == "false" ]];
+then
+ export MAVEN_PHASE="deploy"
+ export BUILD_PROFILE="master"
+ export IMAGE_TAG="${imageTag}-latest"
else
export MAVEN_PHASE="verify"
+ export BUILD_PROFILE="buildDockerImage"
+ export IMAGE_TAG="latest"
fi