upgrade/firefly: do intermediate s3tests on original test set

The later s3-tests fail on early firefly point releases.

Signed-off-by: Sage Weil <sage@redhat.com>