[mesos] 02/02: Updated the way to generate tag for Mesos mini.

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jieyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 14bda1ae68c998fad0c09c2a94e3a51825be421a
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Wed Nov 7 12:10:50 2018 -0800

    Updated the way to generate tag for Mesos mini.
---
 support/jenkins/mini.sh | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/support/jenkins/mini.sh b/support/jenkins/mini.sh
index 76b3cc7..fbf0d8b 100755
--- a/support/jenkins/mini.sh
+++ b/support/jenkins/mini.sh
@@ -13,10 +13,24 @@ DOCKER_IMAGE_DISTRO=${DOCKER_IMAGE_DISTRO:-"mesos/mesos-centos"}
 
 MESOS_SHA=${MESOS_SHA:-$(git rev-parse HEAD)}
 MESOS_TAG_OR_SHA=$(git describe --exact-match "${MESOS_SHA}" 2>/dev/null || echo "${MESOS_SHA}")
-DOCKER_IMAGE_TAG="${MESOS_TAG_OR_SHA}"
+RELEASE_BRANCH=$(git branch --points-at HEAD -r | grep -E 'origin/[0-9]*\.[0-9]*\.[0-9]*x' | grep -E -o '[0-9]*\.[0-9]*\.[0-9]*' || true)
+
+if [ -z "${RELEASE_BRANCH}" ]; then
+  RELEASE_BRANCH="master"
+fi
+
+DATE=$(date +%F)
+
+if [[ "${MESOS_TAG_OR_SHA}" != "${MESOS_SHA}" ]]; then
+  # HEAD is also a tag.
+  DOCKER_IMAGE_TAG="${MESOS_TAG_OR_SHA}"
+else
+  DOCKER_IMAGE_TAG="${RELEASE_BRANCH}-${DATE}"
+fi
 
 echo "MESOS_SHA=${MESOS_SHA}"
-echo "DOCKER_IMAGE_TAG=${MESOS_TAG_OR_SHA}"
+echo "RELEASE_BRANCH=${RELEASE_BRANCH}"
+echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}"
 
 function cleanup {
   docker rmi "$(docker images -q "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}")" || true
@@ -32,7 +46,5 @@ DOCKER_IMAGE_DISTRO=${DOCKER_IMAGE_DISTRO} \
 
 DATE=$(date +%F)
 
-docker tag "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}" "${DOCKER_IMAGE}:${DATE}"
 docker login -u "${USERNAME}" -p "${PASSWORD}"
 docker push "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}"
-docker push "${DOCKER_IMAGE}:${DATE}"