Tools » teuthology

Currently we use the s3-tests branch of the same name as ceph if it is exists, otherwise master. Sometimes we are testing code that is targetted at an older branch (say, firefly) and want to run those s3-tests instead.

It is (maybe?) possible to put this in a yaml and pass it to teuthology-suite, provided the master sha1 generated by teuthology-suite itself doesn't take precedence. However, that makes for an awkward experience for someone who "just wants to run rgw suite on wip-myfix-firefly on firefly".

In reality, I think what we really want is the major release version of the tests. firefly, giant, dumpling, etc. Which means the s3-tests branch more naturally aligns with the ceph-qa-suite branch we are using, not ceph.git.

So, three changes:

1) make the s3-tests branch default to the ceph-qa-suite branch, not ceph branch
2) if the branch doesn't exist, error out
3) add an argument (--s3-tests-branch <foo>) to specify this on the command line

Note that suite branch defaults to the ceph branch. Make sure the s3-tests branch resolution happens after that, so that

teuthology-suite -s rgw -c firefly

will use firefly branch of ceph, suite, and s3-tests.