X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fopnfv-docker.sh;h=07198c608191e690f89204821d1fd576bcde0235;hb=03388550bea11566ed3ae90129bab2e3b01eef1a;hp=adb519394d4312c1f0bc59d8b51f125c53aa11d3;hpb=fb155791e82b4dd41ae053fb5220cc1c88633c01;p=releng.git

diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index adb519394..07198c608 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -17,6 +17,14 @@ echo "--------------------------------------------------------"
 echo
 
 
+if [[ -n $(ps -ef|grep 'docker build'|grep -v grep) ]]; then
+    echo "There is already another build process in progress:"
+    echo $(ps -ef|grep 'docker build'|grep -v grep)
+    # Abort this job since it will colide and might mess up the current one.
+    echo "Aborting..."
+    exit 1
+fi
+
 # Remove previous running containers if exist
 if [[ -n "$(docker ps -a | grep $DOCKER_REPO_NAME)" ]]; then
     echo "Removing existing $DOCKER_REPO_NAME containers..."
@@ -59,14 +67,18 @@ fi
 
 
 # cd to directory where Dockerfile is located
-if [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then
+if [[ "$DOCKER_REPO_NAME" == "opnfv/bottlenecks" ]]; then
+    cd $WORKSPACE/ci/docker
+elif [[ "$DOCKER_REPO_NAME" == "opnfv/cperf" ]]; then
     cd $WORKSPACE/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/yardstick" ]]; then
-    cd $WORKSPACE/ci/docker/yardstick-ci
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/storperf" ]]; then
+elif [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then
     cd $WORKSPACE/docker
 elif [[ "$DOCKER_REPO_NAME" == "opnfv/qtip" ]]; then
     cd $WORKSPACE/docker
+elif [[ "$DOCKER_REPO_NAME" == "opnfv/storperf" ]]; then
+    cd $WORKSPACE/docker
+elif [[ "$DOCKER_REPO_NAME" == "opnfv/yardstick" ]]; then
+    cd $WORKSPACE/tests/ci/docker/yardstick-ci
 else
     echo "ERROR: DOCKER_REPO_NAME parameter not valid: $DOCKER_REPO_NAME"
     exit 1
@@ -78,11 +90,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 +108,16 @@ echo "Tag version to be build and pushed: $DOCKER_TAG"
 
 
 # Start the build
-echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG..."
+echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG"
+
+if [[ $DOCKER_REPO_NAME == *"functest"* ]]; then
+    docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG --build-arg BRANCH=$branch .
+else
+    docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG .
+fi
 
-docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG .
-echo "Creating tag 'latest'..."
-docker tag $DOCKER_REPO_NAME:$DOCKER_TAG $DOCKER_REPO_NAME:latest
+echo "Creating tag '$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 +129,9 @@ if [[ "$PUSH_IMAGE" == "true" ]]; then
     echo "--------------------------------------------------------"
     echo
     # Push to the Dockerhub repository
-    docker push $DOCKER_REPO_NAME:$DOCKER_TAG
+    echo "Pushing $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG ..."
+    docker push $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG
 
-    echo "Updating $DOCKER_REPO_NAME:latest to the docker registry..."
-    docker push $DOCKER_REPO_NAME:latest
+    echo "Pushing $DOCKER_REPO_NAME:$DOCKER_TAG ..."
+    docker push $DOCKER_REPO_NAME:$DOCKER_TAG
 fi