Revert "Use same upgrade-test as firefly."
Merge pull request #132 from ceph/revert-131-wip-9357-wusui

Revert "Use same upgrade-test as firefly."