From 656a1ce9022cb32ac16e4088b9e8a995bc59a632 Mon Sep 17 00:00:00 2001 From: Mike Cronce Date: Mon, 10 Dec 2018 09:24:04 -0500 Subject: [PATCH 1/2] .travis.yml: Also build csi-v1.0 branch --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d87906df6..174ea8faa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: go branches: only: - master + - csi-v1.0 go: 1.9.x From 5cfa6685b07f6b77f0f4db5aa9c72a5c94ff099e Mon Sep 17 00:00:00 2001 From: Mike Cronce Date: Mon, 10 Dec 2018 09:25:17 -0500 Subject: [PATCH 2/2] deploy.sh: Select image versions based on $TRAVIS_BRANCH; push images for both master and csi-v1.0 --- deploy.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/deploy.sh b/deploy.sh index ee5d35ee1..3d62468c3 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,6 +1,14 @@ #!/bin/bash -if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${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 +if [ "${TRAVIS_BRANCH}" == 'master' ]; then + export RBD_IMAGE_VERSION='v0.3.0'; + export CEPHFS_IMAGE_VERSION='v0.3.0'; +elif [ "${TRAVIS_BRANCH}" == 'csi-v1.0' ]; then + export RBD_IMAGE_VERSION='v1.0.0'; + export CEPHFS_IMAGE_VERSION='v1.0.0'; +fi; + +if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ -n "${RBD_IMAGE_VERSION}" ]; then + docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io + make push-image-rbdplugin push-image-cephfsplugin +fi;