oom-upload.sh: fix uploading latest version

Change-Id: Ia2371156f00c7926651cb238a0e2864834a85997

diff --git a/jjb/cloud-infra/scripts/oom-upload.sh b/jjb/cloud-infra/scripts/oom-upload.sh
index 904c58fe9adf024eb6dcee197f5fff451bc1d2bc..696e0ea747dc605352bfa45fdf77c10c53acc4d6 100644 (file)
--- a/jjb/cloud-infra/scripts/oom-upload.sh
+++ b/jjb/cloud-infra/scripts/oom-upload.sh
@@ -22,12 +22,12 @@ set -o errexit
 set -o pipefail
 
 YQ_BIN="${WORKSPACE}/bin/yq"
+ONAP_OOM_GIT_REVISION=$(cd "${WORKSPACE}/build/onap-oom" && git rev-parse --short HEAD)
 ONAP_OOM_VERSION=$(${YQ_BIN} e '.version' "${WORKSPACE}/build/onap-oom/kubernetes/onap/Chart.yaml")
-ONAP_OOM_VERSION_LATEST=$(echo "${ONAP_OOM_VERSION}" | sed 's#+.\+#+latest#')
+ONAP_OOM_VERSION_LATEST="${ONAP_OOM_VERSION//${ONAP_OOM_GIT_REVISION}/latest}"
 
-ONAP_OOM_GIT_REVISION=$(cd "${WORKSPACE}/build/onap-oom" && git rev-parse --short HEAD)
-ONAP_UMBRELLA_CHART=$(find ${WORKSPACE}/build/onap-oom/kubernetes/dist/packages -name onap-${ONAP_OOM_VERSION}.tgz)
-IMAGES_LIST=$(find ${WORKSPACE} -maxdepth 1 -name onap-${ONAP_OOM_VERSION}_images.txt)
+ONAP_UMBRELLA_CHART="${WORKSPACE}/build/onap-oom/kubernetes/dist/packages/onap-${ONAP_OOM_VERSION}.tgz"
+IMAGES_LIST="${WORKSPACE}/onap-${ONAP_OOM_VERSION}_images.txt"
 
 export NORDIX_ARM_REPO="onap"
 export ARTIFACT_ARM_FOLDER="oom"
@@ -52,7 +52,7 @@ for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
   ARTIFACT_SHA256SUM=$(sha256sum "${BUILD_ARTIFACT}" | cut -d' ' -f1)
 
   REMOTE_ARTIFACT=$(basename "${BUILD_ARTIFACT}")
-  REMOTE_ARTIFACT_LATEST=$(echo "${REMOTE_ARTIFACT}" | sed 's#+.\+#+latest#')
+  REMOTE_ARTIFACT_LATEST=$(basename "${BUILD_ARTIFACT//${ONAP_OOM_GIT_REVISION}/latest}")
   # NOTE(cian): URL-encoding remote artifact as filename may contain special characters
   REMOTE_ARTIFACT_QUOTED=$(echo -n "${REMOTE_ARTIFACT}" | python3 -c 'from sys import stdout, stdin; from urllib.parse import quote; stdout.write(quote(stdin.read()))')
   REMOTE_ARTIFACT_LATEST_QUOTED=$(echo -n "${REMOTE_ARTIFACT_LATEST}" | python3 -c 'from sys import stdout, stdin; from urllib.parse import quote; stdout.write(quote(stdin.read()))')
@@ -66,6 +66,7 @@ for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
       -T "${BUILD_ARTIFACT}" \
       "${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT}"
   echo "Info  : Artifact ${BUILD_ARTIFACT} is available on ${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT_QUOTED}"
+  echo "Info  : Uploading ${BUILD_ARTIFACT} to Nordix Artifactory as ${REMOTE_ARTIFACT_LATEST}"
   curl -s -S \
       -H "X-JFrog-Art-Api:${NORDIX_ARM_TOKEN}" \
       -H "X-Checksum-MD5:${ARTIFACT_MD5SUM}" \
@@ -73,7 +74,7 @@ for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
       -H "X-Checksum-Sha256:${ARTIFACT_SHA256SUM}" \
       -T "${BUILD_ARTIFACT}" \
       "${NORDIX_ARTIFACT_URL_LATEST}/${REMOTE_ARTIFACT_LATEST}"
-  echo "Info  : Artifact ${BUILD_ARTIFACT} is also available on ${NORDIX_ARTIFACT_URL_LATEST}/${REMOTE_ARTIFACT_LATEST_QUOTED}"
+  echo "Info  : Artifact ${BUILD_ARTIFACT} available on ${NORDIX_ARTIFACT_URL_LATEST}/${REMOTE_ARTIFACT_LATEST_QUOTED}"
 done
 
 echo "Done!"