From 9d9afc1093857f91b044f203856b958e4941566e Mon Sep 17 00:00:00 2001 From: Huamin Chen Date: Thu, 19 Jul 2018 14:01:05 -0400 Subject: [PATCH] consolidate container deploy Signed-off-by: Huamin Chen --- .travis.yml | 3 +-- deploy-rbd.sh | 6 ------ deploy-cephfs.sh => deploy.sh | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100755 deploy-rbd.sh rename deploy-cephfs.sh => deploy.sh (74%) 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