summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2016-05-03 09:43:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-03 09:43:42 +0000
commitb3dd5d447547be4071668c55e93cf84cb665392b (patch)
tree7a9721d4507291dcdbc1de2f776ba865c9ed146c
parenta77207cece2154246ab6520837b07f0b49f0a235 (diff)
parent0ca5b5b23d60ed6ceda156909a685cb20d16b4e2 (diff)
Merge "Docker, change BASE_VERSION to brahmaputra.3"
-rw-r--r--jjb/opnfv/opnfv-docker.yml4
-rwxr-xr-xutils/calculate_version.sh15
2 files changed, 10 insertions, 9 deletions
diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index 130edd480..936f22040 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -40,7 +40,7 @@
description: "To enable/disable pushing the image to Dockerhub."
- string:
name: BASE_VERSION
- default: "brahmaputra.1"
+ default: "brahmaputra.3"
description: "Base version to be used."
- string:
name: DOCKER_REPO_NAME
@@ -83,7 +83,7 @@
description: "To enable/disable pushing the image to Dockerhub."
- string:
name: BASE_VERSION
- default: "brahmaputra.2"
+ default: "brahmaputra.3"
description: "Base version to be used."
- string:
name: DOCKER_REPO_NAME
diff --git a/utils/calculate_version.sh b/utils/calculate_version.sh
index 4bfd13f7a..608a3bd73 100755
--- a/utils/calculate_version.sh
+++ b/utils/calculate_version.sh
@@ -36,14 +36,15 @@ function docker_version() {
tag_json=$(curl $url_tag 2>/dev/null | python -mjson.tool | grep ${BASE_VERSION} | head -1)
#e.g. tag_json= "name": "brahmaputra.0.2",
if [ "${tag_json}" == "" ]; then
- error "The Docker Image ${docker_image} does not have a TAG with base version ${BASE_VERSION}"
+ echo ${BASE_VERSION}.0
+ else
+ tag=$(echo $tag_json | awk '{print $2}' | sed 's/\,//' | sed 's/\"//g')
+ #e.g.: tag=brahmaputra.0.2
+ tag_current_version=$(echo $tag | sed 's/.*\.//')
+ tag_new_version=$(($tag_current_version+1))
+ #e.g.: tag=brahmaputra.0.3
+ echo ${BASE_VERSION}.${tag_new_version}
fi
- tag=$(echo $tag_json | awk '{print $2}' | sed 's/\,//' | sed 's/\"//g')
- #e.g.: tag=brahmaputra.0.2
- tag_current_version=$(echo $tag | sed 's/.*\.//')
- tag_new_version=$(($tag_current_version+1))
- #e.g.: tag=brahmaputra.0.3
- echo ${BASE_VERSION}.${tag_new_version}
}