Push v1.2-canary image from release-v1.2.0

as part of https://github.com/ceph/ceph-csi/pull/715/
we have updeated the release-v1.2.0 branch to
push v1.2.2 images as the release is done reverting back
the image tag to push canary image.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2019-11-21 10:39:38 +05:30 committed by Madhu Rajanna
parent f8c854dc7d
commit cf9a10c7d0
3 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@
CONTAINER_CMD?=docker CONTAINER_CMD?=docker
CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi) CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi)
CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2.2) CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.2-canary)
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))

View File

@ -34,7 +34,7 @@ push_helm_charts() {
} }
if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
export ENV_CSI_IMAGE_VERSION='v1.2.2' export ENV_CSI_IMAGE_VERSION='v1.2-canary'
else else
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting" echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
exit 0 # Exiting 0 so that this isn't marked as failing exit 0 # Exiting 0 so that this isn't marked as failing

View File

@ -101,7 +101,7 @@ ssh)
;; ;;
cephcsi) cephcsi)
echo "copying the cephcsi image" echo "copying the cephcsi image"
copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.2 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.2 copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2-canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.2.2
;; ;;
k8s-sidecar) k8s-sidecar)
echo "copying the kubernetes sidecar images" echo "copying the kubernetes sidecar images"