Change-Id: Ie7d10556bc5800a332839fb9b624c43d6d1b46a2
Signed-off-by: Cian Johnston <cian.johnston@est.tech>
set -o errexit
set -o pipefail
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)
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"
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}"
#${HELM_BIN} push "${ONAP_UMBRELLA_CHART}" "${NORDIX_REGISTRY}"
export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
ARTIFACT_SHA256SUM=$(sha256sum "${BUILD_ARTIFACT}" | cut -d' ' -f1)
REMOTE_ARTIFACT=$(basename "${BUILD_ARTIFACT}")
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 \
echo "Info : Uploading ${BUILD_ARTIFACT} to Nordix Artifactory"
curl -s -S \
name: NORDIX_REGISTRY
default: "https://registry.nordix.org"
description: Chart registry to upload the built Helm chart.
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'
- string:
name: ONAP_OOM_URL
default: 'https://gerrit.onap.org/r/oom'