summaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-11-05 18:01:29 +0200
committerLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-11-23 16:58:08 +0200
commitb048fb63e8d671c9219071821deedb1f1ddf9f85 (patch)
tree341131917ddf4d8ae158583fe3c65ee56b3ad113 /deployment
parent79f63485849d7d652f997bdc8c1ea7069763814d (diff)
Initial test commit for project-specific CSIT
- move music-distributed-kv-store CSIT to its own project repository - add execution script that copies required common run scripts from integration/csit repo to local workspace and runs the tests - add the possibility to provide additional docker tag as parameter to the build script - add script for tagging specified docker image with STAGING Issue-ID: INT-1769 Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> Change-Id: I19a5908f3c9c77529c43af0d89baf75a8f8557ee
Diffstat (limited to 'deployment')
-rwxr-xr-xdeployment/docker-build.sh9
-rwxr-xr-xdeployment/tag-docker-staging.sh19
2 files changed, 26 insertions, 2 deletions
diff --git a/deployment/docker-build.sh b/deployment/docker-build.sh
index 4568e53..c8f3e1e 100755
--- a/deployment/docker-build.sh
+++ b/deployment/docker-build.sh
@@ -2,13 +2,14 @@
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.0"
PROJECT="music"
IMAGE="distributed-kv-store"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
-TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
+TAG_NAME=${UNIQUE_DOCKER_TAG}
+echo TAG_NAME: ${TAG_NAME}
+set -x
if [ $HTTP_PROXY ]; then
BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
fi
@@ -34,6 +35,10 @@ function build_image {
function push_image {
echo "Start push docker image."
docker push ${IMAGE_NAME}:latest
+ if [ ! -z "${TAG_NAME}" ]; then
+ docker tag ${IMAGE_NAME}:latest ${IMAGE_NAME}:1.0-SNAPSHOT-${TAG_NAME}
+ docker push ${IMAGE_NAME}:1.0-SNAPSHOT-${TAG_NAME}
+ fi
}
function remove_binary {
diff --git a/deployment/tag-docker-staging.sh b/deployment/tag-docker-staging.sh
new file mode 100755
index 0000000..66af8cb
--- /dev/null
+++ b/deployment/tag-docker-staging.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+ORG="onap"
+PROJECT="music"
+IMAGE="distributed-kv-store"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TAG_NAME=${UNIQUE_DOCKER_TAG}
+
+echo TAG_NAME: ${TAG_NAME}
+set -x
+
+echo "Push STAGING tag for docker image."
+if [ ! -z "${TAG_NAME}" ]; then
+ docker pull ${IMAGE_NAME}:1.0-SNAPSHOT-${TAG_NAME}
+ docker tag ${IMAGE_NAME}:1.0-SNAPSHOT-${TAG_NAME} ${IMAGE_NAME}:1.0-STAGING-latest
+ docker push ${IMAGE_NAME}:1.0-STAGING-latest
+fi
+