From: Cian Johnston <cian.johnston@est.tech>
Date: Mon, 17 May 2021 13:24:00 +0000 (+0100)
Subject: onap-oom-helm-build: upload built chart to chartmuseum
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=63df60beb68df4a593351c436ddd5a647e5d2579;p=infra%2Fcicd.git

onap-oom-helm-build: upload built chart to chartmuseum

Change-Id: I327bc86726151960d3cd4f8a92927c4d9bb881a6
---

diff --git a/jjb/cloud-infra/scripts/oom-upload.sh b/jjb/cloud-infra/scripts/oom-upload.sh
index f12bc917c..02197cfa9 100644
--- a/jjb/cloud-infra/scripts/oom-upload.sh
+++ b/jjb/cloud-infra/scripts/oom-upload.sh
@@ -22,18 +22,19 @@ set -o errexit
 set -o pipefail
 
 ONAP_OOM_GIT_REVISION=$(cd "${WORKSPACE}/build/onap-oom" && git rev-parse --short HEAD)
-ONAP_UMBRELLA_CHART="${WORKSPACE}/build/onap-oom/kubernetes/dist/packages/onap-*${ONAP_OOM_GIT_REVISION}.tgz"
-IMAGES_LIST="${WORKSPACE}/onap-*${ONAP_OOM_GIT_REVISION}_images.txt"
+ONAP_UMBRELLA_CHART=$(find ${WORKSPACE}/build/onap-oom/kubernetes/dist/packages -name onap-*${ONAP_OOM_GIT_REVISION}.tgz)
+IMAGES_LIST=$(find ${WORKSPACE} -maxdepth 1 -name onap-*${ONAP_OOM_GIT_REVISION}_images.txt)
 
 export NORDIX_ARM_REPO="onap"
 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}"
 
-# NOTE(cian): Leaving this commented out for the moment.
-#echo "Info  : Pushing ONAP umbrella chart to Nordix Harbor"
-#HELM_BIN="${WORKSPACE}/bin/helm"
-#${HELM_BIN} push "${ONAP_UMBRELLA_CHART}" "${NORDIX_REGISTRY}"
+echo "Info  : Pushing ONAP umbrella chart to Nordix Harbor"
+HELM_BIN="${WORKSPACE}/bin/helm"
+${HELM_BIN} repo remove onaptest || true
+${HELM_BIN} repo add onaptest "${NORDIX_REGISTRY}/chartrepo/onaptest"
+${HELM_BIN} push -f "${ONAP_UMBRELLA_CHART}" --username "${HARBOR_USERNAME}" --password "${HARBOR_PASSWORD}" onaptest
 
 export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
 echo "Info  : Uploading ${BUILD_ARTIFACTS} to Nordix ARM ${NORDIX_ARM_REPO} repository"