Merge "Enable test projects' docker image builds for stable/brahmaputra branch"

2 files changed, 24 insertions, 17 deletions

diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index 545aef6dd..81bab33bb 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -53,22 +53,6 @@ if [[ "$UPDATE_LATEST_STABLE" == "true" ]]; then
 fi
 
 
-# Get tag version
-cd $WORKSPACE
-git clone https://gerrit.opnfv.org/gerrit/releng
-
-DOCKER_TAG=$($WORKSPACE/releng/utils/calculate_version.sh -t docker \
-    -n $DOCKER_REPO_NAME)
-
-ret_val=$?
-if [ $ret_val -ne 0 ]; then
-    echo "Error retrieving the version tag."
-    exit 1
-else
-    echo "Tag version to be build and pushed: $DOCKER_TAG"
-fi
-
-
 # cd to directory where Dockerfile is located
 if [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then
     cd $WORKSPACE/docker
@@ -83,6 +67,27 @@ else
     exit 1
 fi
 
+
+# Get tag version
+branch=$(git rev-parse --abbrev-ref HEAD)
+if [ $branch == "master" ]; then
+    DOCKER_TAG="master"
+else
+    cd $WORKSPACE
+    git clone https://gerrit.opnfv.org/gerrit/releng
+
+    DOCKER_TAG=$($WORKSPACE/releng/utils/calculate_version.sh -t docker \
+        -n $DOCKER_REPO_NAME)
+
+    ret_val=$?
+    if [ $ret_val -ne 0 ]; then
+        echo "Error retrieving the version tag."
+        exit 1
+    fi
+fi
+echo "Tag version to be build and pushed: $DOCKER_TAG"
+
+
 # Start the build
 echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG..."
 
diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index fcbe60be2..13063e39b 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -17,7 +17,9 @@
 
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
+        - brahmaputra:
+            branch: 'stable/{stream}'
 
 ########################
 # job templates