Merge pull request #470 from Madhu-1/fix-travis

update Travis to build and push v1.1.0 images
This commit is contained in:
Humble Devassy Chirammal 2019-07-12 19:35:04 +05:30 committed by GitHub
commit adad72ae83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -14,8 +14,8 @@ services:
language: go language: go
branches: branches:
only: only:
- csi-v0.3
- master - master
- release-v1.1.0
go: 1.12.x go: 1.12.x

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),canary) CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.1.0)
$(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION))

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:canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:canary copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.1.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.1.0
;; ;;
k8s-sidecar) k8s-sidecar)
echo "copying the kubernetes sidecar images" echo "copying the kubernetes sidecar images"