From fa40c1cc58045d71449ea82f3eb87ddde829cf50 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 4 Apr 2019 10:13:00 +0530 Subject: [PATCH] push images to quay.io with canary tag updated deploy.sh script to push images to quay.io with canary tag. Once we merge a PR against master and csi-v0.3 branches we need to build and push the latest image with canary tag. by doing this we can avoid the accidental update of the images which are already deployed with stable tags (i.e v1.0.0 or v0.3.0). Signed-off-by: Madhu Rajanna --- Makefile | 4 ++-- deploy.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c4aab93af..e9b5ee223 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ CONTAINER_CMD?=docker RBD_IMAGE_NAME=$(if $(ENV_RBD_IMAGE_NAME),$(ENV_RBD_IMAGE_NAME),quay.io/cephcsi/rbdplugin) -RBD_IMAGE_VERSION=$(if $(ENV_RBD_IMAGE_VERSION),$(ENV_RBD_IMAGE_VERSION),v1.0.0) +RBD_IMAGE_VERSION=$(if $(ENV_RBD_IMAGE_VERSION),$(ENV_RBD_IMAGE_VERSION),v1.0.0-canary) CEPHFS_IMAGE_NAME=$(if $(ENV_CEPHFS_IMAGE_NAME),$(ENV_CEPHFS_IMAGE_NAME),quay.io/cephcsi/cephfsplugin) -CEPHFS_IMAGE_VERSION=$(if $(ENV_CEPHFS_IMAGE_VERSION),$(ENV_CEPHFS_IMAGE_VERSION),v1.0.0) +CEPHFS_IMAGE_VERSION=$(if $(ENV_CEPHFS_IMAGE_VERSION),$(ENV_CEPHFS_IMAGE_VERSION),v1.0.0-canary) CSI_IMAGE_NAME?=quay.io/cephcsi/cephcsi CSI_IMAGE_VERSION?=v1.0.0 diff --git a/deploy.sh b/deploy.sh index 9eb02b2a8..2241281fb 100755 --- a/deploy.sh +++ b/deploy.sh @@ -25,11 +25,11 @@ push_helm_chats() { } if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then - export RBD_IMAGE_VERSION='v0.3.0' - export CEPHFS_IMAGE_VERSION='v0.3.0' -elif [ "${TRAVIS_BRANCH}" == 'csi-v1.0' ]; then - export RBD_IMAGE_VERSION='v1.0.0' - export CEPHFS_IMAGE_VERSION='v1.0.0' + export RBD_IMAGE_VERSION='v0.3-canary' + export CEPHFS_IMAGE_VERSION='v0.3-canary' +elif [ "${TRAVIS_BRANCH}" == 'master' ]; then + export RBD_IMAGE_VERSION='canary' + export CEPHFS_IMAGE_VERSION='canary' else echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting" exit 0 # Exiting 0 so that this isn't marked as failing