diff --git a/.travis.yml b/.travis.yml index e927865a8..6f3912986 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,4 @@ script: deploy: - provider: script script: - - ./deploy-rbd.sh - - ./deploy-cephfs.sh + - ./deploy.sh diff --git a/deploy-rbd.sh b/deploy-rbd.sh deleted file mode 100755 index 63d88865a..000000000 --- a/deploy-rbd.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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-rbdplugin-container -fi diff --git a/deploy-cephfs.sh b/deploy.sh similarity index 74% rename from deploy-cephfs.sh rename to deploy.sh index 33daed31d..f18ae762a 100755 --- a/deploy-cephfs.sh +++ b/deploy.sh @@ -2,5 +2,5 @@ if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io - make push-cephfs-container + make push-rbdplugin-container push-cephfsplugin-container fi