Update deploy.sh to use the right ENV vars

deploy.sh was using ENV vars to set the image versions
incorrectly. This causes the images to be pushed using
versions already in the Makefile, rather than the overrides
in the deploy script.

This is now fixed by updating the right ENV variables.

Signed-off-by: ShyamsundarR <srangana@redhat.com>
This commit is contained in:
ShyamsundarR 2019-05-07 07:25:36 -04:00 committed by mergify[bot]
parent 882bebf1d8
commit bdc3292dad

View File

@ -25,11 +25,11 @@ push_helm_charts() {
} }
if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then if [ "${TRAVIS_BRANCH}" == 'csi-v0.3' ]; then
export RBD_IMAGE_VERSION='v0.3-canary' export ENV_RBD_IMAGE_VERSION='v0.3-canary'
export CEPHFS_IMAGE_VERSION='v0.3-canary' export ENV_CEPHFS_IMAGE_VERSION='v0.3-canary'
elif [ "${TRAVIS_BRANCH}" == 'master' ]; then elif [ "${TRAVIS_BRANCH}" == 'master' ]; then
export RBD_IMAGE_VERSION='canary' export ENV_RBD_IMAGE_VERSION='canary'
export CEPHFS_IMAGE_VERSION='canary' export ENV_CEPHFS_IMAGE_VERSION='canary'
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