RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-21 09:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #481 from dmick/master

Browse Source 
calamari_nosetests: verify that calamari_branch exists
This commit is contained in:
Andrew Schoen 2015-07-08 14:47:13 -05:00
commit 1d5f368c9a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/calamari_nosetests.py
View File

@ -4,6 +4,7 @@ import os
import textwrap
import yaml
from cStringIO import StringIO
from teuthology import contextutil
from teuthology import misc
from teuthology import packaging
@ -113,10 +114,17 @@ def clone_calamari(config, client):
branch = config.get('calamari_branch', 'master')
url = config.get('calamari_giturl', 'git://github.com/ceph/calamari')
try:
cmd = 'git clone -b {branch} {giturl}'.format(
branch=branch, giturl=url
out = StringIO()
# ensure branch is present (clone -b will succeed even if
# the branch doesn't exist, falling back to master)
client.run(
args='git ls-remote %s %s' % (url, branch),
stdout=out,
label='check for calamari branch %s existence' % branch
)
client.run(args=cmd)
if len(out.getvalue()) == 0:
raise RuntimeError("Calamari branch %s doesn't exist" % branch)
client.run(args='git clone -b %s %s' % (branch, url))
yield
finally:
# sudo python setup.py develop may have left some root files around