onap-oom-helm-build: update build wrapper and upload scripts

[infra/cicd.git] / jjb / cloud-infra / scripts / oom-upload.sh

diff --git a/jjb/cloud-infra/scripts/oom-upload.sh b/jjb/cloud-infra/scripts/oom-upload.sh
index 6e9e6c4ea3296da5ce7ea68145d3a1e3c3abdaba..ce3afb3b216350f13f15d1f0cc1c96caaa226a0c 100644 (file)
--- a/jjb/cloud-infra/scripts/oom-upload.sh
+++ b/jjb/cloud-infra/scripts/oom-upload.sh
@@ -21,17 +21,20 @@
 set -o errexit
 set -o pipefail
 
-ONAP_UMBRELLA_CHART="${WORKSPACE}/build/onap-oom/kubernetes/dist/packages/onap-${ONAP_OOM_CHART_VERSION}.tgz"
+ONAP_UMBRELLA_CHART="${WORKSPACE}/build/onap-oom/kubernetes/dist/packages/onap-*.tgz"
+HELM_BIN="${WORKSPACE}/bin/helm"
 IMAGES_LIST="${WORKSPACE}/images.txt"
+ONAP_OOM_GIT_REVISION=$(cd "${WORKSPACE}/build/onap-oom" && git rev-parse --short HEAD)
 export NORDIX_ARM_REPO="nordix-oom"
 export ARTIFACT_ARM_FOLDER="oom"
 export BUILD_IDENTIFIER="${ONAP_OOM_GIT_REVISION}"
 export NORDIX_ARTIFACT_URL="${NORDIX_ARM_HTTPS_URL}/${NORDIX_ARM_REPO}/${ARTIFACT_ARM_FOLDER}/${BUILD_IDENTIFIER}"
 
-echo "Info  : Pushing ONAP umbrella chart to Nordix Harbor"
-${HELM_BIN} push "${ONAP_UMBRELLA_CHART}" "${NORDIX_REGISTRY}"
+# NOTE(cian): Leaving this commented out for the moment.
+#echo "Info  : Pushing ONAP umbrella chart to Nordix Harbor"
+#${HELM_BIN} push "${ONAP_UMBRELLA_CHART}" "${NORDIX_REGISTRY}"
 
-export BUILD_ARTIFACTS="${IMAGES_LIST}"
+export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
 echo "Info  : Uploading ${BUILD_ARTIFACTS} to Nordix ARM ${NORDIX_ARM_REPO} repository"
 for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
   echo "Info  : Generating checksums for $BUILD_ARTIFACT"
@@ -39,7 +42,7 @@ for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
   ARTIFACT_SHASUM=$(shasum "${BUILD_ARTIFACT}" | cut -d' ' -f1)
   ARTIFACT_SHA256SUM=$(sha256sum "${BUILD_ARTIFACT}" | cut -d' ' -f1)
 
-  REMOTE_ARTIFACT=$(echo "${BUILD_ARTIFACT}" | sed 's/.*\///g')
+  REMOTE_ARTIFACT=$(basename "${BUILD_ARTIFACT}")
 
   echo "Info  : Uploading ${BUILD_ARTIFACT} to Nordix Artifactory"
   curl -s -S \