* Updated oom-upload.sh to also push built artifacts to a 'latest'
location for later use
* Also update onap build/verify/release jobs for master stream to
use k8s master version
Signed-off-by: Cian Johnston <cian.johnston@est.tech>
Change-Id: I4881ef7004fb791d07088ff1f648a94c73e23e84
branch: 'master'
oom_branch: 'master'
deploy-scenario: 'onap-full-nofeature'
branch: 'master'
oom_branch: 'master'
deploy-scenario: 'onap-full-nofeature'
promote-stack: 'false'
container-tool: 'docker'
- 'guilin':
promote-stack: 'false'
container-tool: 'docker'
- 'guilin':
stream:
- 'master':
branch: '{stream}'
stream:
- 'master':
branch: '{stream}'
deploy-scenario: 'onap-full-nofeature'
- 'guilin':
branch: '{stream}'
deploy-scenario: 'onap-full-nofeature'
- 'guilin':
branch: '{stream}'
set -o errexit
set -o pipefail
set -o errexit
set -o pipefail
+YQ_BIN="${WORKSPACE}/bin/yq"
+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_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)
-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)
+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)
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}"
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}"
+export NORDIX_ARTIFACT_URL_LATEST="${NORDIX_ARM_HTTPS_URL}/${NORDIX_ARM_REPO}/${ARTIFACT_ARM_FOLDER}/latest"
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
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
+# Also push with "latest" version
+${HELM_BIN} push -f "${ONAP_UMBRELLA_CHART}" --username "${HARBOR_USERNAME}" --password "${HARBOR_PASSWORD}" --version "${ONAP_OOM_VERSION_LATEST}" onaptest
export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
echo "Info : Uploading ${BUILD_ARTIFACTS} to Nordix ARM ${NORDIX_ARM_REPO} repository"
export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
echo "Info : Uploading ${BUILD_ARTIFACTS} to Nordix ARM ${NORDIX_ARM_REPO} repository"
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}")
+ REMOTE_ARTIFACT_LATEST=$(echo "${REMOTE_ARTIFACT}" | sed 's#+.\+#+latest#')
# NOTE(cian): URL-encoding remote artifact as filename may contain special characters
# 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()))')
+ 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()))')
echo "Info : Uploading ${BUILD_ARTIFACT} to Nordix Artifactory"
curl -s -S \
echo "Info : Uploading ${BUILD_ARTIFACT} to Nordix Artifactory"
curl -s -S \
-H "X-Checksum-Sha256:${ARTIFACT_SHA256SUM}" \
-T "${BUILD_ARTIFACT}" \
"${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT}"
-H "X-Checksum-Sha256:${ARTIFACT_SHA256SUM}" \
-T "${BUILD_ARTIFACT}" \
"${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT}"
- echo "Info : Artifact ${BUILD_ARTIFACT} is available on ${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT}"
+ echo "Info : Artifact ${BUILD_ARTIFACT} is available on ${NORDIX_ARTIFACT_URL}/${REMOTE_ARTIFACT_QUOTED}"
+ curl -s -S \
+ -H "X-JFrog-Art-Api:${NORDIX_ARM_TOKEN}" \
+ -H "X-Checksum-MD5:${ARTIFACT_MD5SUM}" \
+ -H "X-Checksum-Sha1:${ARTIFACT_SHASUM}" \
+ -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}"
.global.ingress.enabled=true,
.global.serviceMesh.enabled=true,
.global.metrics.enabled=true,
.global.ingress.enabled=true,
.global.serviceMesh.enabled=true,
.global.metrics.enabled=true,
+ .global.addTestingComponents=true,
+ .a1policymanagement.enabled=true,
.aaf.enabled=true,
.aai.enabled=true,
.appc.enabled=true,
.cassandra.enabled=true,
.cds.enabled=true,
.aaf.enabled=true,
.aai.enabled=true,
.appc.enabled=true,
.cassandra.enabled=true,
.cds.enabled=true,
+ .cert-wrapper.enabled=true,
.clamp.enabled=true,
.cli.enabled=true,
.consul.enabled=true,
.clamp.enabled=true,
.cli.enabled=true,
.consul.enabled=true,
+ .contrib.enabled=true,
+ .contrib.awx.enabled=false,
+ .contrib.netbox.enabled=false,
.cps.enabled=true,
.dcaegen2.enabled=true,
.dcaegen2-services.enabled=true,
.dcaemod.enabled=true,
.cps.enabled=true,
.dcaegen2.enabled=true,
.dcaegen2-services.enabled=true,
.dcaemod.enabled=true,
.dmaap.enabled=true,
.esr.enabled=true,
.dmaap.enabled=true,
.esr.enabled=true,
- .sniro-emulator.enabled=true,
+ .sniro-emulator.enabled=false,
.oof.enabled=true,
.mariadb-galera.enabled=true,
.oof.enabled=true,
.mariadb-galera.enabled=true,
+ .modeling.enabled=true,
.msb.enabled=true,
.multicloud.enabled=true,
.nbi.enabled=true,
.msb.enabled=true,
.multicloud.enabled=true,
.nbi.enabled=true,
+ .platform.enabled=true,
+ .repository-wrapper.enabled=true,
.robot.enabled=true,
.sdc.enabled=true,
.sdnc.enabled=true,
.so.enabled=true,
.robot.enabled=true,
.sdc.enabled=true,
.sdnc.enabled=true,
.so.enabled=true,
- .uui.enabled=true,
- .vfc.enabled=true,
+ .uui.enabled=false,
+ .vfc.enabled=false,
- .vndsdk.enabled=true,
- .modeling.enabled=true,
- .platform.enabled=true,
- .a1policymanagement.enabled=true,
- .cert-wrapper.enabled=true,
- .repository-wrapper.enabled=true
- string:
name: ONAP_OOM_HELM_CHART_VALUES_OVERRIDE
default: ''
- string:
name: ONAP_OOM_HELM_CHART_VALUES_OVERRIDE
default: ''