mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
Remove csi-v0.3 from deploy.sh
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit 52c4d29f65
)
# Conflicts:
# .travis.yml
# deploy.sh
This commit is contained in:
parent
953c2e166c
commit
6128c530ac
@ -14,7 +14,10 @@ services:
|
||||
language: go
|
||||
branches:
|
||||
only:
|
||||
<<<<<<< HEAD
|
||||
- release-v1.2.0
|
||||
=======
|
||||
>>>>>>> 52c4d29f6... Remove csi-v0.3 from deploy.sh
|
||||
- master
|
||||
|
||||
go: 1.12.x
|
||||
|
@ -35,8 +35,13 @@ push_helm_charts() {
|
||||
fi
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
|
||||
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
|
||||
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
|
||||
exit 0 # Exiting 0 so that this isn't marked as failing
|
||||
|
Loading…
Reference in New Issue
Block a user