diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-03-10 16:37:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-03-10 16:37:19 +0000 |
| commit | a781533e82b16a596653b0147ba15831f939920e (patch) | |
| tree | 4330a0dd5a6c031e3b84c121b88ffcad4cbdc5b0 /jjb | |
| parent | b43eff643e42c9d5fb9911d29cb942e447341735 (diff) | |
| parent | da43c21cc39323054b1be9f645d7c3f59a61bca2 (diff) | |
Merge "Set docker version to be from version properties"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/include-docker-push.sh | 14 |
1 files changed, 13 insertions, 1 deletions
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}; |