- shell:
!include-raw: ./scripts/xtesting-healthcheck.sh
+- builder:
+ name: 'oom-build-installdeps-macro'
+ builders:
+ - shell:
+ !include-raw: ./scripts/oom-build-installdeps.sh
+
- builder:
name: 'oom-build-wrapper-macro'
builders:
--- /dev/null
+#!/bin/bash
+
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 The Nordix Foundation. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+# This is a wrapper to install any required dependencies for running the OOM helm
+# build script.
+
+set -o errexit
+set -o pipefail
+
+sudo apt-get install -y -q=3 \
+ make
+
+# vim: set ts=2 sw=2 expandtab:
set -o errexit
set -o pipefail
-OOM_ROOT_DIR="${WORKSPACE}/oom"
-cd "${OOM_ROOT_DIR}"
+cd "${WORKSPACE}"
./oom-build.sh
# vim: set ts=2 sw=2 expandtab:
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"
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 \
scm:
- git-scm-gerrit:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
- branch: $GERRIT_BRANCH
- refspec: $GERRIT_REFSPEC
+ branch: '{branch}'
+ refspec: '+refs/heads/{branch}:refs/remotes/origin/{branch}'
wipe_workspace: true
clean_before: false
wrappers:
- build-timeout:
- timeout: 10
+ timeout: 600
- nordixinfra-harbor-creds-wrapper
- credentials-binding:
- username-password-separated:
- fix-workspace-permissions
builders:
+ - 'oom-build-installdeps-macro'
- 'oom-build-wrapper-macro'
- 'oom-upload-macro'