diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-12-02 21:50:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-02 21:50:33 +0000 |
| commit | 5047e447f16a36384c8ab6202b0cba37b6df8e49 (patch) | |
| tree | 007d16a95f812f5b97fb15fe9eb90756586e3ea6 | |
| parent | 9d42c99b0e7fb117baaf3b9a689dad642a55fc34 (diff) | |
| parent | 0c737143798a6c9056bb75875c747521fdf72840 (diff) | |
Merge "Add possibility to build a Release Docker image"
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 8 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index e0fbb7564..6f8d81a91 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -66,7 +66,13 @@ echo "Current branch: $branch" if [[ "$branch" == "master" ]]; then DOCKER_TAG="latest" else - DOCKER_TAG="stable" + if [[ "$RELEASE_VERSION" != "" ]]; then + release=$(echo $branch|sed 's/.*\///') + DOCKER_TAG=${release}.${RELEASE_VERSION} + # e.g. colorado.1.0, colorado.2.0, colorado.3.0 + else: + DOCKER_TAG="stable" + fi fi # Start the build diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 0df0ddf6f..7a4c9af51 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -65,6 +65,10 @@ name: DOCKER_REPO_NAME default: "opnfv/{project}" description: "Dockerhub repo to be pushed to." + - string: + name: RELEASE_VERSION + default: "" + description: "Release version, e.g. 1.0, 2.0, 3.0" scm: - git-scm: |