mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-23 14:50:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove csi-v0.3 from deploy.sh

Browse Source 
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit 52c4d29f65)

# Conflicts:
#	.travis.yml
#	deploy.sh
This commit is contained in:
Madhu Rajanna 2019-10-01 14:17:08 +05:30 committed by Madhu Rajanna
parent 953c2e166c
commit 6128c530ac
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -14,7 +14,10 @@ services:
language: go language: go
branches: branches:
only: only:
<<<<<<< HEAD
- release-v1.2.0 - release-v1.2.0
=======
>>>>>>> 52c4d29f6... Remove csi-v0.3 from deploy.sh
- master - master
go: 1.12.x go: 1.12.x

5
deploy.sh
View File

@ -35,8 +35,13 @@ push_helm_charts() {
fi fi
} }
<<<<<<< HEAD
if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
export ENV_CSI_IMAGE_VERSION='v1.2-canary' export ENV_CSI_IMAGE_VERSION='v1.2-canary'
=======
if [ "${TRAVIS_BRANCH}" == 'master' ]; then
export ENV_CSI_IMAGE_VERSION='canary'
>>>>>>> 52c4d29f6... Remove csi-v0.3 from deploy.sh
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