From 78750b2dd5edf4ba5b449645f257d8533e8ecbd9 Mon Sep 17 00:00:00 2001 From: Mike Cronce Date: Mon, 10 Dec 2018 11:05:25 -0500 Subject: [PATCH 1/2] .travis.yml: Run deploy.sh on all branches --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 174ea8faa..bdb91e8cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,3 +23,5 @@ deploy: - provider: script script: - ./deploy.sh + on: + all_branches: true From b20f4184ba0045f2af9ba96ba268726df35e3dc2 Mon Sep 17 00:00:00 2001 From: Mike Cronce Date: Mon, 10 Dec 2018 11:06:08 -0500 Subject: [PATCH 2/2] deploy.sh: Exit if branch is not on whitelist --- deploy.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 3d62468c3..f0df889d4 100755 --- a/deploy.sh +++ b/deploy.sh @@ -6,9 +6,13 @@ if [ "${TRAVIS_BRANCH}" == 'master' ]; then elif [ "${TRAVIS_BRANCH}" == 'csi-v1.0' ]; then export RBD_IMAGE_VERSION='v1.0.0'; export CEPHFS_IMAGE_VERSION='v1.0.0'; +else + echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"; + exit 0; # Exiting 0 so that this isn't marked as failing fi; -if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ -n "${RBD_IMAGE_VERSION}" ]; then +if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io make push-image-rbdplugin push-image-cephfsplugin fi; +