From c2433197d4fba6bea36713878cd38c3c523b4327 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Tue, 23 Feb 2016 11:44:46 +0100
Subject: docker: Make it possible to specify tags for Docker Images of test
 projects

Also use latest for images built on master and stable for images built on stable branch.

Change-Id: I0988be86abcb2a13d8e94962b4ba1ced8778793b
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/functest/functest-ci-jobs.yml   |  8 +++++++-
 jjb/opnfv/opnfv-docker.sh           | 12 +++++++-----
 jjb/yardstick/yardstick-ci-jobs.yml |  8 +++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index e0750f338..01e1885cb 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -13,10 +13,12 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
+        docker-tag: 'latest'
     brahmaputra: &brahmaputra
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
+        docker-tag: 'brahmaputra.1.0'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -124,6 +126,10 @@
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-nofeature-ha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -261,7 +267,7 @@
             sudo rm -rf ${dir_result}/*
             res_volume="-v ${dir_result}:/home/opnfv/functest/results"
 
-            docker pull opnfv/functest:latest >$redirect
+            docker pull opnfv/functest:$DOCKER_TAG >$redirect
             cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash"
             echo "Functest: Running docker run command: ${cmd}"
             ${cmd}
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index 4089a6ff3..2b4ca907a 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -78,11 +78,13 @@ echo "Current branch: $branch"
 
 if [[ "$branch" == "master" ]]; then
     DOCKER_TAG="master"
+    DOCKER_BRANCH_TAG="latest"
 else
     git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng
 
     DOCKER_TAG=$($WORKSPACE/releng/utils/calculate_version.sh -t docker \
         -n $DOCKER_REPO_NAME)
+    DOCKER_BRANCH_TAG="stable"
 
     ret_val=$?
     if [[ $ret_val -ne 0 ]]; then
@@ -94,11 +96,11 @@ echo "Tag version to be build and pushed: $DOCKER_TAG"
 
 
 # Start the build
-echo "Building docker image: $DOCKER_REPO_NAME:latest"
+echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG"
 
-docker build --no-cache -t $DOCKER_REPO_NAME:latest .
+docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG .
 echo "Creating tag '$DOCKER_TAG'..."
-docker tag -f $DOCKER_REPO_NAME:latest $DOCKER_REPO_NAME:$DOCKER_TAG
+docker tag -f $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG $DOCKER_REPO_NAME:$DOCKER_TAG
 
 # list the images
 echo "Available images are:"
@@ -110,8 +112,8 @@ if [[ "$PUSH_IMAGE" == "true" ]]; then
     echo "--------------------------------------------------------"
     echo
     # Push to the Dockerhub repository
-    echo "Pushing $DOCKER_REPO_NAME:latest ..."
-    docker push $DOCKER_REPO_NAME:latest
+    echo "Pushing $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG ..."
+    docker push $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG
 
     echo "Pushing $DOCKER_REPO_NAME:$DOCKER_TAG ..."
     docker push $DOCKER_REPO_NAME:$DOCKER_TAG
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index dc209159c..ec3bbe193 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -13,10 +13,12 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
+        docker-tag: 'latest'
     brahmaputra: &brahmaputra
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '{stream}'
+        docker-tag: 'brahmaputra.1.0'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -175,6 +177,10 @@
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-nofeature-ha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
         - string:
             name: YARDSTICK_SUITE_NAME
             default: opnfv_${{NODE_NAME}}_{suite}.yaml
@@ -237,7 +243,7 @@
                 -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
 
             # Pull the latest image
-            docker pull opnfv/yardstick >$redirect
+            docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
 
             # Run docker
             cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
-- 
cgit 1.2.3-korg