mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from ceph/m-fix

Browse Source 
consolidate container deploy
This commit is contained in:
Huamin Chen 2018-07-19 14:08:42 -04:00 committed by GitHub
commit 341a293526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -21,5 +21,4 @@ script:
deploy: deploy:
- provider: script - provider: script
script: script:
- ./deploy-rbd.sh - ./deploy.sh
- ./deploy-cephfs.sh

6
deploy-rbd.sh
View File

@ -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

2
deploy-cephfs.sh → deploy.sh
View File

@ -2,5 +2,5 @@
if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io
make push-cephfs-container make push-rbdplugin-container push-cephfsplugin-container
fi fi