This is an automated email from the ASF dual-hosted git repository. jieyu pushed a commit to branch 1.7.x in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 5c2782334029717346c1a9d6e627bf3c87665a87 Author: Jie Yu <[email protected]> AuthorDate: Sat Oct 27 13:03:41 2018 -0700 Updated Jenkins Mesos mini script. To adapt to the new Docker Centos build pipeline. (cherry picked from commit 8583c5e44536dacc60225d5662ac63151466f6d7) --- support/jenkins/mini.sh | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/support/jenkins/mini.sh b/support/jenkins/mini.sh index 4f94b6c..76b3cc7 100755 --- a/support/jenkins/mini.sh +++ b/support/jenkins/mini.sh @@ -5,41 +5,34 @@ set -o errexit -o nounset -o pipefail -o verbose CURRENT_DIR="$(cd "$(dirname "$0")"; pwd -P)" SUPPORT_DIR="${CURRENT_DIR}/.." -: ${USERNAME:?"Environment variable 'USERNAME' must be set to the username of the 'Mesos DockerBot' Docker hub account."} -: ${PASSWORD:?"Environment variable 'PASSWORD' must be set to the password of the 'Mesos DockerBot' Docker hub account."} +: "${USERNAME:?"Environment variable 'USERNAME' must be set to the username of the 'Mesos DockerBot' Docker hub account."}" +: "${PASSWORD:?"Environment variable 'PASSWORD' must be set to the password of the 'Mesos DockerBot' Docker hub account."}" -MESOS_SHA=${MESOS_SHA:-`git rev-parse HEAD`} -MESOS_VERSION=`git describe --exact-match $MESOS_SHA 2>/dev/null || echo $MESOS_SHA` - -echo "MESOS_SHA=$MESOS_SHA" -echo "MESOS_VERSION=$MESOS_VERSION" - -DOCKER_IMAGE_MINI=${DOCKER_IMAGE_MINI:-"mesos/mesos-mini"} -DOCKER_IMAGE_PACKAGING=${DOCKER_IMAGE_PACKAGING:-"mesos/mesos-centos-packaging"} +DOCKER_IMAGE=${DOCKER_IMAGE:-"mesos/mesos-mini"} DOCKER_IMAGE_DISTRO=${DOCKER_IMAGE_DISTRO:-"mesos/mesos-centos"} -if [[ "$MESOS_VERSION" != "$MESOS_SHA" ]]; then - # HEAD is also a tag. - DOCKER_IMAGE_TAG="$MESOS_VERSION" -else - DOCKER_IMAGE_TAG=`date +%F` -fi +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}" + +echo "MESOS_SHA=${MESOS_SHA}" +echo "DOCKER_IMAGE_TAG=${MESOS_TAG_OR_SHA}" function cleanup { - docker rmi $(docker images -q ${DOCKER_IMAGE_PACKAGING}:${DOCKER_IMAGE_TAG}) || true - docker rmi $(docker images -q ${DOCKER_IMAGE_DISTRO}:${DOCKER_IMAGE_TAG}) || true - docker rmi $(docker images -q ${DOCKER_IMAGE_MINI}:${DOCKER_IMAGE_TAG}) || true + docker rmi "$(docker images -q "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}")" || true + docker rmi "$(docker images -q "${DOCKER_IMAGE_DISTRO}:${DOCKER_IMAGE_TAG}")" || true } trap cleanup EXIT -DOCKER_IMAGE_MINI=${DOCKER_IMAGE_MINI} \ -DOCKER_IMAGE_PACKAGING=${DOCKER_IMAGE_PACKAGING} \ -DOCKER_IMAGE_DISTRO=${DOCKER_IMAGE_DISTRO} \ +DOCKER_IMAGE=${DOCKER_IMAGE} \ DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG} \ +DOCKER_IMAGE_DISTRO=${DOCKER_IMAGE_DISTRO} \ "${SUPPORT_DIR}/mesos-mini/build.sh" -docker tag ${DOCKER_IMAGE_MINI}:${DOCKER_IMAGE_TAG} ${DOCKER_IMAGE_MINI}:latest -docker login -u ${USERNAME} -p ${PASSWORD} -docker push ${DOCKER_IMAGE_MINI}:${DOCKER_IMAGE_TAG} -docker push ${DOCKER_IMAGE_MINI}:latest +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}"
