From: Venkata Harish K Kajur <vk250x@att.com>
Date: Thu, 9 Mar 2017 22:17:50 +0000 (+0000)
Subject: Set docker version to be from version properties
X-Git-Tag: 1.0.0-Amsterdam~589^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F1973%2F1;p=ci-management.git

Set docker version to be from version properties

Change-Id: I9a6e25c25cc3587b7c03ea24d04dc7b8e29d7d17
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---

diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index 30aa32d7a..7b42fcd73 100644
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -3,7 +3,19 @@
 DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
 SEARCH="aai-service";
 DATETIME_STAMP=$(date +%Y%m%dT%H%M%S);
-VERSION=1.0.0;
+VERSION_FILE="version.properties"
+
+# Check for the version file
+# If it exists, load the version from that file
+# If not found, then use the current version as 1.1.0 for docker images
+if [ -f "$VERSION_FILE" ]; then
+    source $VERSION_FILE;
+    VERSION=$release_version;
+else
+    VERSION=1.1.0;
+fi
+
+
 SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP};
 STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP};