]> git.apps.os.sepia.ceph.com Git - teuthology.git/log
teuthology.git
12 years agoDon't redefine variable
Zack Cerza [Thu, 26 Sep 2013 16:42:02 +0000 (11:42 -0500)]
Don't redefine variable
(cherry picked from commit 083717c1b4022289806030faf23ff7c4aa371f19)

12 years agoRemove unused variables
Zack Cerza [Thu, 26 Sep 2013 16:09:55 +0000 (11:09 -0500)]
Remove unused variables
(cherry picked from commit 581b6b3e977b99fc58fe25e66c933c65e38dc87c)

12 years agoRemove unused imports
Zack Cerza [Thu, 26 Sep 2013 15:47:43 +0000 (10:47 -0500)]
Remove unused imports
(cherry picked from commit 586817481119c4fc4a39f8804e7871a43491e01f)

12 years agoFix undefined name errors
Zack Cerza [Thu, 26 Sep 2013 15:32:28 +0000 (10:32 -0500)]
Fix undefined name errors
(cherry picked from commit f59497ef2214f29d5995435d83766c7994e8f2cd)

12 years agoMake teuthology.locker a module
Zack Cerza [Thu, 26 Sep 2013 15:29:45 +0000 (10:29 -0500)]
Make teuthology.locker a module

12 years agoAdd missing requirement: web.py
Zack Cerza [Thu, 26 Sep 2013 15:29:17 +0000 (10:29 -0500)]
Add missing requirement: web.py
(cherry picked from commit 1b3349525c361d4253f76729f8416ac6d9029289)

12 years agoadd flake8 checks to teuthology
Alfredo Deza [Thu, 26 Sep 2013 15:49:51 +0000 (11:49 -0400)]
add flake8 checks to teuthology

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 27c9eb8f81dc25c7b50bfb77d4d2d4ab4d136fb6)
(cherry picked from commit b390d68ff4b7a648da3f22bd5ae34651d02fd915)

12 years agoMerge pull request #111 from ceph/wip-missing-packages
Alfredo Deza [Thu, 26 Sep 2013 12:36:08 +0000 (05:36 -0700)]
Merge pull request #111 from ceph/wip-missing-packages

If we're scheduling for non-ubuntu, look for rpms

12 years agoIf we're scheduling for non-ubuntu, look for rpms 111/head
Zack Cerza [Wed, 25 Sep 2013 22:36:04 +0000 (17:36 -0500)]
If we're scheduling for non-ubuntu, look for rpms

12 years agoMerge pull request #110 from ceph/wip-nuke-import-os
Zack Cerza [Wed, 25 Sep 2013 20:49:23 +0000 (13:49 -0700)]
Merge pull request #110 from ceph/wip-nuke-import-os

nuke: add missing import os

12 years agonuke: add missing import os 110/head
Sage Weil [Wed, 25 Sep 2013 20:42:03 +0000 (13:42 -0700)]
nuke: add missing import os

$ teuthology-nuke  -a . -r -u
Traceback (most recent call last):
  File "/home/ubuntu/bin/teuthology-nuke", line 9, in <module>
    load_entry_point('teuthology==0.0.1', 'console_scripts', 'teuthology-nuke')()
  File "/home/ubuntu/teuthology/teuthology/nuke.py", line 343, in main
    ifn = os.path.join(ctx.archive, 'info.yaml')
UnboundLocalError: local variable 'os' referenced before assignment

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #109 from ceph/wip-6388
Zack Cerza [Wed, 25 Sep 2013 13:50:35 +0000 (06:50 -0700)]
Merge pull request #109 from ceph/wip-6388

only use host_key if it is not None

12 years agoonly use host_key if it is not None 109/head
Alfredo Deza [Wed, 25 Sep 2013 13:25:35 +0000 (09:25 -0400)]
only use host_key if it is not None

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agorbd: move xfstest TESTDIR=... bit to front of command
Sage Weil [Tue, 24 Sep 2013 23:50:07 +0000 (16:50 -0700)]
rbd: move xfstest TESTDIR=... bit to front of command

2013-09-24T11:32:49.169 DEBUG:teuthology.orchestra.run:Running [10.214.132.4]: "/usr/bin/sudo adjust-ulimits ceph-coverage /home/ubuntu/cephtest/archive/coverage TESTDIR=/home/ubuntu/cephtest /bin/bash /home/ubuntu/cephtest/run_xfstests.sh -c 1 -f xfs -t /dev/rbd1 -s /dev/rbd2 '1-9 11-15 17 19-21 26-29 31-34 41 46-
54 56 61 63-67 69-70 74-76 78-79 84-89 91'"
2013-09-24T11:32:49.211 INFO:teuthology.task.rbd.client.1.err:[10.214.131.22]: /usr/bin/ceph-coverage: 25: exec: TESTDIR=/home/ubuntu/cephtest: not found

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoFix namespace collision
Zack Cerza [Tue, 24 Sep 2013 19:19:24 +0000 (14:19 -0500)]
Fix namespace collision

12 years agoceph.conf: fix typo
Sage Weil [Tue, 24 Sep 2013 17:03:24 +0000 (10:03 -0700)]
ceph.conf: fix typo

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoAdd config option 'verify_host_keys'
Zack Cerza [Tue, 24 Sep 2013 16:48:11 +0000 (11:48 -0500)]
Add config option 'verify_host_keys'

Defaults to True, meaning no change in behavior. If False, don't have
paramiko verify ssh host keys.

12 years agoMerge pull request #107 from ceph/wip-fix-undefined-config
Zack Cerza [Tue, 24 Sep 2013 16:41:44 +0000 (09:41 -0700)]
Merge pull request #107 from ceph/wip-fix-undefined-config

fix an undefined name buy importing config

12 years agofix an undefined name buy importing config 107/head
Alfredo Deza [Tue, 24 Sep 2013 16:39:43 +0000 (12:39 -0400)]
fix an undefined name buy importing config

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agoceph.conf: reduce min pg per osd
Sage Weil [Tue, 24 Sep 2013 15:49:32 +0000 (08:49 -0700)]
ceph.conf: reduce min pg per osd

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #106 from ceph/wip-mirror
Alfredo Deza [Tue, 24 Sep 2013 15:17:22 +0000 (08:17 -0700)]
Merge pull request #106 from ceph/wip-mirror

Remove lots of ceph.com hardcoding; default to upstream sources

12 years agoSplit test into two 106/head
Zack Cerza [Tue, 24 Sep 2013 15:09:04 +0000 (10:09 -0500)]
Split test into two

12 years agoMerge pull request #105 from ceph/wip-missing-packages
Alfredo Deza [Tue, 24 Sep 2013 13:59:49 +0000 (06:59 -0700)]
Merge pull request #105 from ceph/wip-missing-packages

When scheduling fails, send an email.

12 years agoWhen scheduling fails, send an email. 105/head
Zack Cerza [Tue, 24 Sep 2013 01:14:28 +0000 (20:14 -0500)]
When scheduling fails, send an email.

Note that if no email is passed on the command line, no error email will
be sent. I did this to be polite.

12 years agoDon't hardcode the git://ceph.com/git/ mirror
Zack Cerza [Fri, 20 Sep 2013 20:53:58 +0000 (15:53 -0500)]
Don't hardcode the git://ceph.com/git/ mirror

Default to https://github.com/ceph/ but add a ~/teuthology.yaml option

12 years agoDon't hardcode ceph.com mirror for linux-firmware
Zack Cerza [Fri, 20 Sep 2013 20:53:00 +0000 (15:53 -0500)]
Don't hardcode ceph.com mirror for linux-firmware

12 years agoMerge pull request #103 from ceph/toxify
Zack Cerza [Fri, 20 Sep 2013 20:50:52 +0000 (13:50 -0700)]
Merge pull request #103 from ceph/toxify

Toxify teuthology

12 years agomove the sitepackages to testenv section 103/head
Alfredo Deza [Fri, 20 Sep 2013 20:28:29 +0000 (16:28 -0400)]
move the sitepackages to testenv section

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agotell py.test that we want teuthology stuff only
Alfredo Deza [Fri, 20 Sep 2013 20:25:57 +0000 (16:25 -0400)]
tell py.test that we want teuthology stuff only

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agotell tox to use site-packages
Alfredo Deza [Fri, 20 Sep 2013 20:13:49 +0000 (16:13 -0400)]
tell tox to use site-packages

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agojust use python 2.7 for now
Alfredo Deza [Fri, 20 Sep 2013 16:57:30 +0000 (12:57 -0400)]
just use python 2.7 for now

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agomake sure we don't hard code the path for py.test
Alfredo Deza [Fri, 20 Sep 2013 16:50:13 +0000 (12:50 -0400)]
make sure we don't hard code the path for py.test

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agoappend .tox to avoid going in there
Alfredo Deza [Fri, 20 Sep 2013 16:44:27 +0000 (12:44 -0400)]
append .tox to avoid going in there

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agoDon't hardcode teuthology's git repo URL
Zack Cerza [Fri, 20 Sep 2013 20:12:02 +0000 (15:12 -0500)]
Don't hardcode teuthology's git repo URL

12 years agoAdd a basic test for teuthology.config
Zack Cerza [Fri, 20 Sep 2013 20:11:13 +0000 (15:11 -0500)]
Add a basic test for teuthology.config

12 years agoMerge pull request #104 from ceph/wip-copyfrom
Zack Cerza [Fri, 20 Sep 2013 20:06:34 +0000 (13:06 -0700)]
Merge pull request #104 from ceph/wip-copyfrom

fix ceph_test_rados args

12 years agorados: only pass --op copy_from if non-zero 104/head
Sage Weil [Fri, 20 Sep 2013 19:56:45 +0000 (12:56 -0700)]
rados: only pass --op copy_from if non-zero

Among other things, this does not work with older ceph_test_rados binaries.

Backport: next
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoAdd config.ceph_git_base_url
Zack Cerza [Fri, 20 Sep 2013 19:38:01 +0000 (14:38 -0500)]
Add config.ceph_git_base_url

12 years agoUse config.lock_server
Zack Cerza [Fri, 20 Sep 2013 19:34:53 +0000 (14:34 -0500)]
Use config.lock_server

12 years agoAdd doc noting Inktank's lockserver URL
Zack Cerza [Fri, 20 Sep 2013 19:01:07 +0000 (14:01 -0500)]
Add doc noting Inktank's lockserver URL

Since I just removed it from lockstatus.py.

12 years agoUse teuthology.config.
Zack Cerza [Fri, 20 Sep 2013 19:00:46 +0000 (14:00 -0500)]
Use teuthology.config.

Also use os.path.join()

12 years agoadd a tox file
Alfredo Deza [Fri, 20 Sep 2013 14:25:46 +0000 (10:25 -0400)]
add a tox file

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agoadd .tox to gitignore
Alfredo Deza [Fri, 20 Sep 2013 14:25:36 +0000 (10:25 -0400)]
add .tox to gitignore

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
12 years agoMerge pull request #102 from ceph/wip-tests
Alfredo Deza [Fri, 20 Sep 2013 14:01:48 +0000 (07:01 -0700)]
Merge pull request #102 from ceph/wip-tests

Update all existing unit tests.

12 years agoUpdate test_connect() to reflect API changes 102/head
Zack Cerza [Fri, 20 Sep 2013 13:38:23 +0000 (08:38 -0500)]
Update test_connect() to reflect API changes

Looks like paramiko changed a bit internally. All unit tests pass now!

12 years agoUpdate many unit tests to reflect 2yrs of changes
Zack Cerza [Fri, 20 Sep 2013 00:29:06 +0000 (19:29 -0500)]
Update many unit tests to reflect 2yrs of changes

These tests hadn't been updated in over two years. Only one is left
failing.

12 years agoAdd pytest.ini
Zack Cerza [Thu, 19 Sep 2013 23:14:51 +0000 (18:14 -0500)]
Add pytest.ini

So far this just tells py.test not to recurse into directories
containing tests it doesn't need to run.

12 years agoMerge pull request #101 from ceph/fix-adjust-ulimits-b
Alfredo Deza [Thu, 19 Sep 2013 21:07:44 +0000 (14:07 -0700)]
Merge pull request #101 from ceph/fix-adjust-ulimits-b

Put helper scripts in /usr/bin

12 years agoPut helper scripts in /usr/bin 101/head
Zack Cerza [Thu, 19 Sep 2013 21:06:40 +0000 (16:06 -0500)]
Put helper scripts in /usr/bin

12 years agoMerge pull request #100 from ceph/wip-tests
Alfredo Deza [Thu, 19 Sep 2013 20:57:17 +0000 (13:57 -0700)]
Merge pull request #100 from ceph/wip-tests

Add test for teuthology.suite.build_email_body()

12 years agoPort to py.test 100/head
Zack Cerza [Thu, 19 Sep 2013 20:55:38 +0000 (15:55 -0500)]
Port to py.test

12 years agoAdd test for teuthology.suite.build_email_body()
Zack Cerza [Thu, 19 Sep 2013 20:36:33 +0000 (15:36 -0500)]
Add test for teuthology.suite.build_email_body()

12 years agoFix typo
Zack Cerza [Thu, 19 Sep 2013 03:57:20 +0000 (22:57 -0500)]
Fix typo

12 years agoMerge pull request #98 from ceph/time-fix
Alfredo Deza [Wed, 18 Sep 2013 19:23:22 +0000 (12:23 -0700)]
Merge pull request #98 from ceph/time-fix

If duration is missing from summary.yaml, use 0

12 years agoIf duration is missing from summary.yaml, use 0 98/head
Zack Cerza [Wed, 18 Sep 2013 19:08:23 +0000 (14:08 -0500)]
If duration is missing from summary.yaml, use 0

12 years agoMerge pull request #97 from ceph/sentry
Alfredo Deza [Wed, 18 Sep 2013 15:35:58 +0000 (08:35 -0700)]
Merge pull request #97 from ceph/sentry

Fix logs URL on Sentry pages.

12 years agoFix logs URL on Sentry pages. 97/head
Zack Cerza [Wed, 18 Sep 2013 15:05:14 +0000 (10:05 -0500)]
Fix logs URL on Sentry pages.

12 years agoMerge pull request #96 from ceph/wip-fix-sudoers
SandonV [Tue, 17 Sep 2013 23:13:15 +0000 (16:13 -0700)]
Merge pull request #96 from ceph/wip-fix-sudoers

Make sed expressions safe to run multiple times

12 years agoMake sed expressions safe to run multiple times 96/head
Zack Cerza [Tue, 17 Sep 2013 23:04:04 +0000 (18:04 -0500)]
Make sed expressions safe to run multiple times

Also, make them ignore commented lines.

12 years agoRevert "suite: don't schedule follow-on summary job for an empty run"
Zack Cerza [Tue, 17 Sep 2013 18:13:46 +0000 (13:13 -0500)]
Revert "suite: don't schedule follow-on summary job for an empty run"

This reverts commit a2b7c728964fb0064ba2a69818289caf723f09fc.

12 years agosuite: do not calculate product on an empty list (take 2)
Sage Weil [Tue, 17 Sep 2013 03:22:09 +0000 (20:22 -0700)]
suite: do not calculate product on an empty list (take 2)

The original attempt to fix this with dda7954090ccc9ffd8ecd961d6b530a0e6d24964
failed because I screwed up the indentation for the out.append(...) line.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoRevert "suite: do not calculate product on an empty list"
Zack Cerza [Mon, 16 Sep 2013 23:33:21 +0000 (18:33 -0500)]
Revert "suite: do not calculate product on an empty list"

This reverts commit dda7954090ccc9ffd8ecd961d6b530a0e6d24964.

This commit was causing the number of jobs scheduled per suite to be
multiplied by anywhere from 2 to 7 or more.

12 years agoMerge pull request #94 from ceph/wip-fix-sudoers
SandonV [Mon, 16 Sep 2013 20:49:39 +0000 (13:49 -0700)]
Merge pull request #94 from ceph/wip-fix-sudoers

Use teuthology-specific backup for /etc/sudoers

12 years agoUse teuthology-specific backup for /etc/sudoers 94/head
Zack Cerza [Mon, 16 Sep 2013 20:25:16 +0000 (15:25 -0500)]
Use teuthology-specific backup for /etc/sudoers

12 years agoMerge pull request #93 from ceph/wip-runfix
Alfredo Deza [Mon, 16 Sep 2013 18:50:39 +0000 (11:50 -0700)]
Merge pull request #93 from ceph/wip-runfix

Make run_job merge job_config['config'] if needed

12 years agoMake run_job merge job_config['config'] if needed 93/head
Zack Cerza [Mon, 16 Sep 2013 18:14:52 +0000 (13:14 -0500)]
Make run_job merge job_config['config'] if needed

12 years agoMerge pull request #92 from ceph/sentry
Alfredo Deza [Mon, 16 Sep 2013 17:37:24 +0000 (10:37 -0700)]
Merge pull request #92 from ceph/sentry

Be less picky about trailing slashes.

12 years agoBe less picky about trailing slashes. 92/head
Zack Cerza [Mon, 16 Sep 2013 16:37:39 +0000 (11:37 -0500)]
Be less picky about trailing slashes.

12 years agoMerge pull request #91 from ceph/wip-suite
Alfredo Deza [Fri, 13 Sep 2013 15:41:35 +0000 (08:41 -0700)]
Merge pull request #91 from ceph/wip-suite

suite: do not calculate product on an empty list

12 years agosuite: don't schedule follow-on summary job for an empty run 91/head
Sage Weil [Fri, 13 Sep 2013 15:39:30 +0000 (08:39 -0700)]
suite: don't schedule follow-on summary job for an empty run

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agosuite: be verbose about how many jobs we generate
Sage Weil [Fri, 13 Sep 2013 15:39:13 +0000 (08:39 -0700)]
suite: be verbose about how many jobs we generate

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agosuite: do not calculate product on an empty list
Sage Weil [Fri, 13 Sep 2013 15:22:12 +0000 (08:22 -0700)]
suite: do not calculate product on an empty list

This fixes a bug where a directory with just % generates a
bogus job item with no actual content.  (e.g.,

$ find basic
basic
basic/%
$ teuthology-suite --dry-run --base . --collections basic --name foo
INFO:teuthology.suite:Collection basic in ./basic
INFO:teuthology.suite:configs [('basic/{}', [])]

...which then blows up because the job yaml is empty.  With
the fix, there are no generated jobs:

$ teuthology-suite --dry-run --base . --collections basic --name foo
INFO:teuthology.suite:Collection basic in ./basic
INFO:teuthology.suite:configs []

(The configs print was temporarily added for debugging
purposes.)

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #90 from ceph/sentry
Zack Cerza [Thu, 12 Sep 2013 22:56:06 +0000 (15:56 -0700)]
Merge pull request #90 from ceph/sentry

Fix get_http_log_path(), update callers, add tests

12 years agoFix get_http_log_path(), update callers, add tests 90/head
Zack Cerza [Thu, 12 Sep 2013 22:28:50 +0000 (17:28 -0500)]
Fix get_http_log_path(), update callers, add tests

12 years agoMerge branch 'master' of github.com:ceph/teuthology
tamil [Thu, 12 Sep 2013 22:07:32 +0000 (15:07 -0700)]
Merge branch 'master' of github.com:ceph/teuthology

12 years agomade help more readable
tamil [Thu, 12 Sep 2013 22:03:10 +0000 (15:03 -0700)]
made help more readable

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
12 years agoFix TypeError
Zack Cerza [Thu, 12 Sep 2013 21:39:55 +0000 (16:39 -0500)]
Fix TypeError
(cherry picked from commit c4591a16e1781f8da3502b38e3dc72f629478312)

12 years agoMerge pull request #88 from ceph/wip-fix-clones
Alfredo Deza [Thu, 12 Sep 2013 17:17:23 +0000 (10:17 -0700)]
Merge pull request #88 from ceph/wip-fix-clones

Use check_output() and log.exception()

12 years agoUse check_output() and log.exception() 88/head
Zack Cerza [Thu, 12 Sep 2013 16:14:08 +0000 (11:14 -0500)]
Use check_output() and log.exception()

This should help us figure out why our checkouts keep getting deleted.

12 years agofeature # 5942. Added examples to teuthology binaries help page
tamil [Thu, 12 Sep 2013 00:13:22 +0000 (17:13 -0700)]
feature # 5942. Added examples to teuthology binaries help page

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
12 years agoMerge pull request #87 from ceph/sentry
Alfredo Deza [Wed, 11 Sep 2013 21:06:24 +0000 (14:06 -0700)]
Merge pull request #87 from ceph/sentry

Add logs URL to sentry reports

12 years agoAdd teuthology branch to sentry report tags 87/head
Zack Cerza [Wed, 11 Sep 2013 20:45:45 +0000 (15:45 -0500)]
Add teuthology branch to sentry report tags

12 years agoEnsure teuthology_branch is stored in job_config
Zack Cerza [Wed, 11 Sep 2013 20:40:14 +0000 (15:40 -0500)]
Ensure teuthology_branch is stored in job_config

12 years agoAdd ctx.config to sentry info.
Zack Cerza [Wed, 11 Sep 2013 20:17:22 +0000 (15:17 -0500)]
Add ctx.config to sentry info.

12 years agoMerge job_config and ctx.config
Zack Cerza [Wed, 11 Sep 2013 20:14:58 +0000 (15:14 -0500)]
Merge job_config and ctx.config

12 years agoAdd test for misc.get_http_log_path()
Zack Cerza [Wed, 11 Sep 2013 19:49:15 +0000 (14:49 -0500)]
Add test for misc.get_http_log_path()

12 years agoUse sentry.get_ident() again
Zack Cerza [Wed, 11 Sep 2013 19:00:58 +0000 (14:00 -0500)]
Use sentry.get_ident() again

12 years agoDon't fail if there's no job_id
Zack Cerza [Wed, 11 Sep 2013 18:56:48 +0000 (13:56 -0500)]
Don't fail if there's no job_id

12 years agoPassing job_id to get_http_log_path() is optional
Zack Cerza [Wed, 11 Sep 2013 18:47:49 +0000 (13:47 -0500)]
Passing job_id to get_http_log_path() is optional

12 years agoAdd logs URL to sentry reports
Zack Cerza [Wed, 11 Sep 2013 15:17:02 +0000 (10:17 -0500)]
Add logs URL to sentry reports

12 years agoAdd job id and actual archive dir to job config
Zack Cerza [Wed, 11 Sep 2013 14:59:45 +0000 (09:59 -0500)]
Add job id and actual archive dir to job config
Also add job id to info.yaml

12 years agoDon't "import misc as teuthology"
Zack Cerza [Wed, 11 Sep 2013 15:08:18 +0000 (10:08 -0500)]
Don't "import misc as teuthology"

12 years agoMove get_http_log_path
Zack Cerza [Wed, 11 Sep 2013 14:45:46 +0000 (09:45 -0500)]
Move get_http_log_path

12 years agos/jobid/job_id/
Zack Cerza [Tue, 10 Sep 2013 19:44:38 +0000 (14:44 -0500)]
s/jobid/job_id/

12 years agorados: add --op copy_from ... support
Sage Weil [Tue, 10 Sep 2013 23:53:18 +0000 (16:53 -0700)]
rados: add --op copy_from ... support

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #85 from ceph/wip-testdir
Sage Weil [Tue, 10 Sep 2013 19:20:29 +0000 (12:20 -0700)]
Merge pull request #85 from ceph/wip-testdir

remove basedir/testdir distinction

12 years agoremove basedir/testdir distinction 85/head
Sage Weil [Tue, 10 Sep 2013 17:53:41 +0000 (10:53 -0700)]
remove basedir/testdir distinction

We should never run with a conflicting testdir in the basedir, and the
code to do this is confusing and buggy.  Go back to a single testdir and
simple checks.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #84 from ceph/wip-buck-daemon-helper
Josh Durgin [Mon, 9 Sep 2013 19:45:48 +0000 (12:45 -0700)]
Merge pull request #84 from ceph/wip-buck-daemon-helper

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoAdding in erroneously removed args 84/head
Joe Buck [Mon, 9 Sep 2013 19:07:29 +0000 (12:07 -0700)]
Adding in erroneously removed args

The 'kill' argument was accidentially removed
as part of patch
53b8e27da996f2efdcc4eb687f3bda0791a8d947

Signed-off-by: Joe Buck <jbbuck@gmail.com>
12 years agoMerge remote-tracking branch 'gh/wip-valgrind'
Sage Weil [Mon, 9 Sep 2013 04:52:49 +0000 (21:52 -0700)]
Merge remote-tracking branch 'gh/wip-valgrind'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>