From 30a81ab039392ef36224ee64c7ead25e8e30dd9f Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 2 Apr 2018 22:57:44 -0400 Subject: Fix docker tag based in CIMAN-132 The new mvn-phase-lib.sh contains the fix for pushing docker tags according to CIMAN-132. This change makes sure that we are using the new mvn-phase-lib.sh for R2. Issue-ID: DCAEGEN2-206 Change-Id: Id36ae5ebecd936d188dee1af8c5fd5eb93a097b3 Signed-off-by: Lusheng Ji --- mvn-phase-script.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index 86c3554..ab9605c 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -37,10 +37,18 @@ if [ -z "$SETTINGS_FILE" ]; then fi set +e +RELEASE_TAG=${MVN_RELEASE_TAG:-R2} +if [ "$RELEASE_TAG" != "R1" ]; then + RELEASE_TAGGED_DIR="${RELEASE_TAG}/" +else + RELEASE_TAGGED_DIR="releases" +fi if ! wget -O ${PROJECT_ROOT}/mvn-phase-lib.sh \ - "$MVN_RAWREPO_BASEURL_DOWNLOAD"/org.onap.dcaegen2.utils/releases/scripts/mvn-phase-lib.sh; then - cp "${PROJECT_ROOT}"/scripts/mvn-phase-lib.sh "${PROJECT_ROOT}/mvn-phase-lib.sh" + "$MVN_RAWREPO_BASEURL_DOWNLOAD"/org.onap.dcaegen2.utils/${RELEASE_TAGGED_DIR}scripts/mvn-phase-lib.sh; then + echo "Fail to download mvn-phase-lib.sh" + exit 1 fi + source "${PROJECT_ROOT}"/mvn-phase-lib.sh -- cgit 1.2.3-korg