mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-10 00:10:20 +00:00
ci: update Makefile and deploy.sh for image tag
as we need to build and push the v3.0.0 image, updated the Makefile and deploy.sh to build and push image and helm tempaltes Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
parent
2f0819b303
commit
d06dd095c2
2
Makefile
2
Makefile
@ -22,7 +22,7 @@ CPUS?=$(shell nproc --ignore=1)
|
|||||||
CPUSET?=--cpuset-cpus=0-${CPUS}
|
CPUSET?=--cpuset-cpus=0-${CPUS}
|
||||||
|
|
||||||
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),canary)
|
CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v3.0.0)
|
||||||
CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)
|
CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION)
|
||||||
|
|
||||||
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))
|
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))
|
||||||
|
@ -82,8 +82,8 @@ build_push_images() {
|
|||||||
make push-manifest
|
make push-manifest
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "${TRAVIS_BRANCH}" == 'master' ]; then
|
if [ "${TRAVIS_BRANCH}" == 'release-v3.0' ]; then
|
||||||
export ENV_CSI_IMAGE_VERSION='canary'
|
export ENV_CSI_IMAGE_VERSION='v3.0.0'
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user