From ff7cfc70812e912e20c7fdf1456190a2e26ee0bb Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 19 Jan 2018 21:13:34 +0000 Subject: [PATCH] SEARCH-663 (Reduce the number of build plans on Bamboo) --- search-services/packaging/buildAndTest.sh | 51 ++++++++++++----------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh index 46faff7c0..889fb798e 100755 --- a/search-services/packaging/buildAndTest.sh +++ b/search-services/packaging/buildAndTest.sh @@ -3,32 +3,33 @@ set -e [ "$DEBUG" ] && set -x -# set current working directory to the directory of the script -cd "$bamboo_working_directory" - nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'` -dockerImage="quay.io/alfresco/search-services:$bamboo_maven_version" -echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version" -docker build -t $dockerImage target/docker-resources - -echo "Running tests" -docker run --rm "$dockerImage" [ -d /opt/alfresco-search-services/solr ] || (echo "solr dir does not exist" && exit 1) -docker run --rm "$dockerImage" [ -d /opt/alfresco-search-services/data/alfrescoModels ] || (echo "alfrescoModels dir does not exist" && exit 1) -docker run --rm "$dockerImage" [ -e /opt/alfresco-search-services/solr.in.sh ] || (echo "solr.in.sh does not exist" && exit 1) -docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-search-services/solr.in.sh || (echo "solr.in.sh does not contain Alfresco config" && exit 1) -docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-search-services/solr.in.cmd || (echo "solr.in.cmd does not containAlfresco config" && exit 1) -docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-search-services/solr.in.sh || (echo "solr.in.sh does not contain LOG4J_PROPS" && exit 1) -docker run --rm "$dockerImage" grep -q LOG4J_CONFIG /opt/alfresco-search-services/solr.in.cmd || (echo "solr.in.cmd does not contain LOG4J_CONFIG" && exit 1) -docker run --rm "$dockerImage" [ -e /opt/alfresco-search-services/solrhome/conf/shared.properties ] || (echo "shared.properties does not exist" && exit 1) -docker run --rm "$dockerImage" /opt/alfresco-search-services/solr/bin/solr start - -if [ "${nicebranch}" = "local" ] +if [ "${nicebranch}" = "master" ] then - echo "Skipping docker publish for local build" -else - echo "Publishing $dockerImage..." - docker push "$dockerImage" -fi + # set current working directory to the directory of the script + cd "$bamboo_working_directory" -echo "Docker SUCCESS" + dockerImage="quay.io/alfresco/search-services:$bamboo_maven_version" + echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version" + + docker build -t $dockerImage packaging/target/docker-resources + + echo "Running tests" + docker run --rm "$dockerImage" [ -d /opt/alfresco-search-services/solr ] || (echo "solr dir does not exist" && exit 1) + docker run --rm "$dockerImage" [ -d /opt/alfresco-search-services/data/alfrescoModels ] || (echo "alfrescoModels dir does not exist" && exit 1) + docker run --rm "$dockerImage" [ -e /opt/alfresco-search-services/solr.in.sh ] || (echo "solr.in.sh does not exist" && exit 1) + docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-search-services/solr.in.sh || (echo "solr.in.sh does not contain Alfresco config" && exit 1) + docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-search-services/solr.in.cmd || (echo "solr.in.cmd does not containAlfresco config" && exit 1) + docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-search-services/solr.in.sh || (echo "solr.in.sh does not contain LOG4J_PROPS" && exit 1) + docker run --rm "$dockerImage" grep -q LOG4J_CONFIG /opt/alfresco-search-services/solr.in.cmd || (echo "solr.in.cmd does not contain LOG4J_CONFIG" && exit 1) + docker run --rm "$dockerImage" [ -e /opt/alfresco-search-services/solrhome/conf/shared.properties ] || (echo "shared.properties does not exist" && exit 1) + docker run --rm "$dockerImage" /opt/alfresco-search-services/solr/bin/solr start + + echo "Publishing $dockerImage..." + docker push "$dockerImage" + + echo "Docker SUCCESS" +else + echo "Only building and publishing docker images from master. Skipping for ${nicebranch}" +fi