onap-oom-helm-build: add missing parameters and url-quote version

Change-Id: Ie7d10556bc5800a332839fb9b624c43d6d1b46a2
Signed-off-by: Cian Johnston <cian.johnston@est.tech>

diff --git a/jjb/cloud-infra/scripts/oom-upload.sh b/jjb/cloud-infra/scripts/oom-upload.sh
index ce3afb3b216350f13f15d1f0cc1c96caaa226a0c..6cd0b1c0288c068b3785dba6f1aae7c9bfd83b26 100644 (file)
--- a/jjb/cloud-infra/scripts/oom-upload.sh
+++ b/jjb/cloud-infra/scripts/oom-upload.sh
@@ -21,17 +21,18 @@
 set -o errexit
 set -o pipefail
 
-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"
+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"
+
+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}"
 
 export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
@@ -43,6 +44,8 @@ for BUILD_ARTIFACT in $BUILD_ARTIFACTS; do
   ARTIFACT_SHA256SUM=$(sha256sum "${BUILD_ARTIFACT}" | cut -d' ' -f1)
 
   REMOTE_ARTIFACT=$(basename "${BUILD_ARTIFACT}")
+  # NOTE(cian): URL-encoding remote artifact as filename may contain special characters
+  REMOTE_ARTIFACT=$(echo -n "${REMOTE_ARTIFACT}" | python3 -c 'from sys import stdout, stdin; from urllib.parse import quote; stdout.write(quote(stdin.read()))')
 
   echo "Info  : Uploading ${BUILD_ARTIFACT} to Nordix Artifactory"
   curl -s -S \

diff --git a/jjb/onap/oom/oom-build-jobs.yaml b/jjb/onap/oom/oom-build-jobs.yaml
index be51c520b3a9944f29140f942d26bc737717139d..2d4b9dd66b385159432056838745f9dac5350abe 100644 (file)
--- a/jjb/onap/oom/oom-build-jobs.yaml
+++ b/jjb/onap/oom/oom-build-jobs.yaml
@@ -61,6 +61,10 @@
           name: NORDIX_REGISTRY
           default: "https://registry.nordix.org"
           description: Chart registry to upload the built Helm chart.
+      - string:
+          name: NORDIX_ARM_HTTPS_URL
+          default: "https://artifactory.nordix.org/artifactory"
+          description: "Artifact Repository Manager to which to upload the built artifacts."
       - string:
           name: ONAP_OOM_URL
           default: 'https://gerrit.onap.org/r/oom'