RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-16 00:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initialize BASE before using it.

Browse Source
This commit is contained in:
Josh Durgin 2011-06-10 11:12:34 -07:00
parent 798f3cc68c
commit 41e19f5ecb
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
teuthology/misc.py
View File

@ -10,6 +10,18 @@ import urlparse
log = logging.getLogger(__name__)
def get_ceph_binary_url(branch=None, tag=None, sha1=None, flavor=None):
if flavor is None:
flavor = ''
else:
# TODO hardcoding amd64 here for simplicity; clients will try
# to fetch the tarball matching their arch, non-x86_64 just
# won't find anything and the test will fail. trying to
# support cross-arch clusters is messy because nothing
# guarantees the same sha1 of "master" has been built for all
# of them. hoping for yagni.
flavor = '-{flavor}-amd64'.format(flavor=flavor)
BASE = 'http://ceph.newdream.net/gitbuilder{flavor}/output/'.format(flavor=flavor)
if sha1 is not None:
assert branch is None, "cannot set both sha1 and branch"
assert tag is None, "cannot set both sha1 and tag"
@ -30,18 +42,6 @@ def get_ceph_binary_url(branch=None, tag=None, sha1=None, flavor=None):
sha1 = sha1_fp.read().rstrip('\n')
sha1_fp.close()
if flavor is None:
flavor = ''
else:
# TODO hardcoding amd64 here for simplicity; clients will try
# to fetch the tarball matching their arch, non-x86_64 just
# won't find anything and the test will fail. trying to
# support cross-arch clusters is messy because nothing
# guarantees the same sha1 of "master" has been built for all
# of them. hoping for yagni.
flavor = '-{flavor}-amd64'.format(flavor=flavor)
BASE = 'http://ceph.newdream.net/gitbuilder{flavor}/output/'.format(flavor=flavor)
log.debug('Using ceph sha1 %s', sha1)
bindir_url = urlparse.urljoin(BASE, 'sha1/{sha1}/'.format(sha1=sha1))
return (sha1, bindir_url)