From cfd9508585c8c85165af08b7a2f9f5f6b3ccd356 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Thu, 27 Aug 2020 16:13:36 +0300 Subject: [PATCH] ACS-550 Add extra debug info in build scripts [skip ci] --- scripts/travis/build.sh | 8 +++++++- scripts/travis/build_functions.sh | 2 ++ scripts/travis/init.sh | 8 +++++++- scripts/travis/maven_release.sh | 11 ++++++++++- scripts/travis/verify_release_tag.sh | 16 +++++++++++++++- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index e188b7bd8e..2c4fff11d6 100644 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash -set -ev +echo "=========================== Starting Build Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../../" source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh" @@ -15,3 +17,7 @@ fi mvn -B -V install -DskipTests -Dmaven.javadoc.skip=true "${PROFILES}" +popd +set +vex +echo "=========================== Finishing Build Script ==========================" + diff --git a/scripts/travis/build_functions.sh b/scripts/travis/build_functions.sh index 305d60da3c..220bdfbed0 100644 --- a/scripts/travis/build_functions.sh +++ b/scripts/travis/build_functions.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set +vx function isPullRequestBuild() { test "${TRAVIS_PULL_REQUEST}" != "false" @@ -126,3 +127,4 @@ function retieveLatestTag() { rm -rf "${LOCAL_PATH}" } +set -vx diff --git a/scripts/travis/init.sh b/scripts/travis/init.sh index 9f14ef0d06..efec4313b3 100644 --- a/scripts/travis/init.sh +++ b/scripts/travis/init.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash -set -ev +echo "=========================== Starting Init Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../../" # Maven Setup @@ -17,3 +19,7 @@ sudo service docker restart # not helpful in this script # export HOST_IP=$(hostname -I | cut -f1 -d' ') +popd +set +vex +echo "=========================== Finishing Init Script ==========================" + diff --git a/scripts/travis/maven_release.sh b/scripts/travis/maven_release.sh index 7c7ac742b6..2c53e714e8 100755 --- a/scripts/travis/maven_release.sh +++ b/scripts/travis/maven_release.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash -set -ev +echo "=========================== Starting Release Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex +pushd "$(dirname "${BASH_SOURCE[0]}")/../../" + # Use full history for release git checkout -B "${TRAVIS_BRANCH}" @@ -15,3 +19,8 @@ mvn -B \ -Dusername="${GIT_USERNAME}" \ -Dpassword="${GIT_PASSWORD}" + +popd +set +vex +echo "=========================== Finishing Release Script ==========================" + diff --git a/scripts/travis/verify_release_tag.sh b/scripts/travis/verify_release_tag.sh index 1d263800e7..f868cdce27 100755 --- a/scripts/travis/verify_release_tag.sh +++ b/scripts/travis/verify_release_tag.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash -set -ev +echo "=========================== Starting Verify Release Tag Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex +pushd "$(dirname "${BASH_SOURCE[0]}")/../../" # # Check that the version to be released does not already have a docker tag. @@ -10,6 +13,11 @@ printf "POM version: %s\n" "${POM_VERSION}" IMAGE_TAG="${POM_VERSION%-SNAPSHOT}" +if git rev-parse "${IMAGE_TAG}^{tag}" &>/dev/null ; then + echo "The next tag \"${IMAGE_TAG}\" already exists in the git project" + exit 1 +fi + # get the image name from the pom file ALFRESCO_DOCKER_IMAGE="$(mvn -B -q help:evaluate -f ./packaging/docker-alfresco/pom.xml -Dexpression=image.name -DforceStdout)" DOCKER_IMAGE_FULL_NAME="${ALFRESCO_DOCKER_IMAGE}:${IMAGE_TAG}" @@ -36,3 +44,9 @@ if docker_image_exists "${DOCKER_IMAGE_FULL_NAME}" ; then else echo "The ${RELEASE_VERSION} tag was not found" fi + + +popd +set +vex +echo "=========================== Finishing Verify Release Tag Script ==========================" +