X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=deployment%2Ftag-docker-staging.sh;fp=deployment%2Ftag-docker-staging.sh;h=7aeb4737e4facbfb80c242bdd070bb925738d905;hp=55d3c726f5c466d82a2d5ea343ac776a4edf8fe4;hb=a5b8a6e45e9566919b45f2995f5dee353523bd11;hpb=b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2

diff --git a/deployment/tag-docker-staging.sh b/deployment/tag-docker-staging.sh
index 55d3c726..7aeb4737 100755
--- a/deployment/tag-docker-staging.sh
+++ b/deployment/tag-docker-staging.sh
@@ -20,17 +20,29 @@ ORG="onap"
 IMAGES=("ccsdk-dgbuilder-image" "ccsdk-odlsli-alpine-image")
 IMAGE_NAME_BASE="${DOCKER_REPOSITORY}/${ORG}/"
 TAG_NAME=${UNIQUE_DOCKER_TAG}
-
+TIMESTAMP=`date +'%Y%m%dT%H%M%SZ'`
 set -x
+# Create tags based on version.properties
 source ../version.properties
+LATEST_MINOR_TAG=${release_name}.${sprint_number}-STAGING-latest
+LATEST_FULL_TAG=${release_name}.${sprint_number}.${feature_revision}-STAGING-latest
+LATEST_FULL_TIMESTAMP_TAG=${release_name}.${sprint_number}.${feature_revision}-STAGING-${TIMESTAMP}
+
 if [ ! -z "${TAG_NAME}" ]; then
 for i in ${!IMAGES[@]};
   do
     image=${IMAGE_NAME_BASE}${IMAGES[$i]}
-    echo "Push STAGING tag for docker image ${image}"
+    echo "Push STAGING tags for docker image ${image}"
     docker pull ${image}:${snapshot_version}-${TAG_NAME}
-    docker tag ${image}:${snapshot_version}-${TAG_NAME} ${image}:${release_name}.${sprint_number}.${feature_revision}-STAGING-latest
-    docker push ${image}:${release_name}.${sprint_number}.${feature_revision}-STAGING-latest
+
+    docker tag ${image}:${snapshot_version}-${TAG_NAME} ${image}:${LATEST_MINOR_TAG}
+    docker tag ${image}:${snapshot_version}-${TAG_NAME} ${image}:${LATEST_FULL_TAG}
+    docker tag ${image}:${snapshot_version}-${TAG_NAME} ${image}:${LATEST_FULL_TIMESTAMP_TAG}
+
+    docker push ${image}:${LATEST_MINOR_TAG}
+    docker push ${image}:${LATEST_FULL_TAG}
+    docker push ${image}:${LATEST_FULL_TIMESTAMP_TAG}
+
   done
 fi