Push Docker Release from Tags on the Master Branch

[releng.git] / jjb / releng / opnfv-docker.sh

diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 174bb57..40e0ed6 100644 (file)
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -23,9 +23,9 @@ function remove_containers_images()
     #
     # $ docker ps -a
     # CONTAINER ID        IMAGE                            COMMAND      ...
-    # 6a796ed40b8e        opnfv/compass-tasks:latest       "/bin/bash"  ...
-    # 99fcb59f4787        opnfv/compass-tasks-base:latest  "/bin/bash"  ...
-    # cc5eee16b995        opnfv/compass-tasks-k8s          "/bin/bash"  ...
+    # 6a796ed40b8e        opnfv/example-tasks:latest       "/bin/bash"  ...
+    # 99fcb59f4787        opnfv/example-tasks-base:latest  "/bin/bash"  ...
+    # cc5eee16b995        opnfv/example-tasks-k8s          "/bin/bash"  ...
     #
     # Cut image name by leading space and ending space or colon(tag)
     if [[ -n "$(docker ps -a | grep " $DOCKER_REPO_NAME[ :]")" ]]; then
@@ -44,9 +44,9 @@ function remove_containers_images()
     #
     # $ docker images
     # REPOSITORY                    TAG                 IMAGE ID        ...
-    # opnfv/compass-tasks           latest              6501569fd328    ...
-    # opnfv/compass-tasks-base      latest              8764fe29c434    ...
-    # opnfv/compass-tasks-k8s       latest              61094cac9e65    ...
+    # opnfv/example-tasks           latest              6501569fd328    ...
+    # opnfv/example-tasks-base      latest              8764fe29c434    ...
+    # opnfv/example-tasks-k8s       latest              61094cac9e65    ...
     #
     # Cut image name by start of line and ending space
     if [[ -n "$(docker images | grep "^$DOCKER_REPO_NAME ")" ]]; then
@@ -105,7 +105,13 @@ fi
 
 if [[ "$BRANCH" == "master" ]]; then
     DOCKER_TAG="latest"
-elif [[ -n "${RELEASE_VERSION-}" ]]; then
+fi
+
+if [[ "$BRANCH" =~ "stable" ]]; then
+    DOCKER_TAG="stable"
+fi
+
+if [[ -n "${RELEASE_VERSION-}" ]]; then
     DOCKER_TAG=${RELEASE_VERSION}
     if git checkout ${RELEASE_VERSION}; then
         echo "Successfully checked out the git tag ${RELEASE_VERSION}"
@@ -114,8 +120,6 @@ elif [[ -n "${RELEASE_VERSION-}" ]]; then
         git tag
         exit 1
     fi
-else
-    DOCKER_TAG="stable"
 fi
 
 if [[ -n "${COMMIT_ID-}" && -n "${RELEASE_VERSION-}" ]]; then