mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-22 14:20:19 +00:00
Merge branch 'master' into 'merge-csiv1.0'
This commit is contained in:
commit
034125d6bd
@ -25,11 +25,11 @@ push_helm_charts() {
|
||||
}
|
||||
|
||||
if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then
|
||||
export RBD_IMAGE_VERSION='v0.3-canary'
|
||||
export CEPHFS_IMAGE_VERSION='v0.3-canary'
|
||||
export ENV_RBD_IMAGE_VERSION='v0.3-canary'
|
||||
export ENV_CEPHFS_IMAGE_VERSION='v0.3-canary'
|
||||
elif [ "${TRAVIS_BRANCH}" == 'master' ]; then
|
||||
export RBD_IMAGE_VERSION='canary'
|
||||
export CEPHFS_IMAGE_VERSION='canary'
|
||||
export ENV_RBD_IMAGE_VERSION='canary'
|
||||
export ENV_CEPHFS_IMAGE_VERSION='canary'
|
||||
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