From d437858ace912c24148af8cee96ade5ea0935674 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 9 Jul 2020 17:44:39 +0300 Subject: [PATCH 1/3] review changes --- .travis.settings.xml | 1 - .travis.yml | 10 +++---- scripts/setUpMavenPhase.sh | 54 +++++++++++++++++++++++++++----------- 3 files changed, 43 insertions(+), 22 deletions(-) diff --git a/.travis.settings.xml b/.travis.settings.xml index 538f0b95d5..e60b0e0c4c 100644 --- a/.travis.settings.xml +++ b/.travis.settings.xml @@ -38,7 +38,6 @@ - docker.io diff --git a/.travis.yml b/.travis.yml index b19650f185..f9fb2732f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,10 @@ services: branches: only: - - /release\/V3.0.*/ - - /feature-3.0\/.*/ - - /merge-3.0\/.*/ - - /hotfix-3.0\/.*/ + - /release\/V3.\d.*/ + - /feature-3.\d\/.*/ + - /merge-3.\d\/.*/ + - /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" diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh index d20fe92de9..8705e8543d 100644 --- a/scripts/setUpMavenPhase.sh +++ b/scripts/setUpMavenPhase.sh @@ -1,23 +1,45 @@ #!/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}" -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 - +case ${TRAVIS_JOB_NAME} in +"Build AGS Community"|"Build AGS Benchmark" ) + 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 + ;; +"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 \ No newline at end of file From 47ed81cd5fd89446fe8b8507573b905ad60a9dbf Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 9 Jul 2020 21:01:46 +0300 Subject: [PATCH 2/3] update the branch version number --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9fb2732f6..291010aa54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,10 @@ services: branches: only: - - /release\/V3.\d.*/ - - /feature-3.\d\/.*/ - - /merge-3.\d\/.*/ - - /hotfix-3.\d\/.*/ + - /release\/V3.\d+.*/ + - /feature-3.\d+\/.*/ + - /merge-3.\d+\/.*/ + - /hotfix-3.\d+\/.*/ cache: directories: From db73960b21a9531cbe49507ff94fe54ea8a0a5f1 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 13 Jul 2020 09:56:36 +0300 Subject: [PATCH 3/3] simplify script (code review) --- scripts/setUpMavenPhase.sh | 57 +++++++++++++------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh index 8705e8543d..688f019df8 100644 --- a/scripts/setUpMavenPhase.sh +++ b/scripts/setUpMavenPhase.sh @@ -2,44 +2,27 @@ 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" - 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 - ;; -"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 \ No newline at end of file + 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