diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-adapter.yaml | 4 | ||||
| -rwxr-xr-x | shell/docker-ts-tag-override.sh | 50 |
2 files changed, 53 insertions, 1 deletions
diff --git a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml index bb0a9f73b..ef56413f8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml @@ -32,8 +32,10 @@ name: dcaegen2-platform-aoadapter # root of docker build docker-root: adapter/acumos + # tag override + docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh # image name - docker-name: '{name}' + docker-name: 'onap/{name}' stream: - master: branch: master diff --git a/shell/docker-ts-tag-override.sh b/shell/docker-ts-tag-override.sh new file mode 100755 index 000000000..e14d2e5a9 --- /dev/null +++ b/shell/docker-ts-tag-override.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# ================================================================================ +# Copyright (c) 2019 AT&T Intellectual Property. 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. +# ============LICENSE_END========================================================= + +set -feu -o pipefail + +echo "--> docker-ts-tag-override.sh" + +# Get project version from pom.xml +version=`xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" $DOCKER_ROOT/pom.xml` +echo "INFO: version from pom file $version" + +# Some pom has -SNAPSHOT or -STAGING under pom version, remove all text +version="${version//[^0-9.]/}" + +# Get build TS for specifying in the tag +timestamp=$(date +%C%y%m%dT%H%M%SZ) + +# Following the https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process +# IndependentVersioningandReleaseProcess-StandardizedDockerTagging +# ONAP Tag requirement : {imagename}:{semver}-SNAPSHOT-{timestamp}Z (from CIMAN-132) + +if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + tag="${version}-SNAPSHOT-${timestamp}" +else + # Default to latest tag with TS if not conforming to semantic versioning + echo "WARN: version not complaint to sem-ver; tag defaulted to latest" + version=latest + tag="${version}-${timestamp}" +fi + +echo "INFO: docker tag is $tag" + +# Write DOCKER_IMAGE_TAG information to a file so it can be +# injected into the environment for following steps +echo "DOCKER_IMAGE_TAG=$tag" >> "$WORKSPACE/env_docker_inject.txt" |